Changeset 604

Timestamp:

Jul 8, 2011, 5:57:04 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: make cups working again

Location:

trunk/server/source3

Files:

• build.cmd (modified) (3 diffs)
• configure (modified) (1 diff)

trunk/server/source3/build.cmd

@@ -6 +6 @@
 /* version 0.3.0 from 17.08.2010 Silvan (redone a lot) */
 /* version 0.3.1 from 20.08.2010 Silvan (added version.ecs check) */
+/* version 0.3.2 from 08.07.2011 Silvan (pythonhome may be not set) */
 
 /* load the sysfuncs if not already loaded */
@@ -15 +16 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.1"
-version_date = "20.08.2010"
+version = "0.3.2"
+version_date = "08.07.2011"
 
 
@@ -131 +132 @@
     if sEnvVar <> '' then do
     sPythonVersion = PythonVersion(sEnvVar);
-    end
     if sPythonVersion <> '-1' then do
     call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
     call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
+    end
     end
 

trunk/server/source3/configure

@@ -13944 +13944 @@
 fi
 
+
+
         if test "x$CUPS_CONFIG" != x; then
 
-                ac_save_CFLAGS=$CFLAGS
                 ac_save_LDFLAGS=$LDFLAGS
-                ac_save_PRINT_LIBS=$PRINT_LIBS
-                case "$host_os" in
+                case "$host_os" in
                                 *os2*)
-                 PRINT_LIBS="$PRINT_LIBS -lcups -lpthread"
+                 PRINT_LIBS="$PRINT_LIBS -lpthread -lz"
                                  ;;
                                  *)
-                CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
-                LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-                PRINT_LIBS="$PRINT_LIBS -lcups"
-                                 ;;
+                                 ;;
                  esac
-                for ac_header in cups/cups.h cups/language.h
+                ac_save_PRINT_LIBS=$PRINT_LIBS
+                for ac_header in cups/cups.h cups/language.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`