Changeset 644 for branches/samba-3.3.x/source

Timestamp:

Oct 25, 2011, 4:59:31 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.3: some small adjustments for cups and unneeded function removed

Location:

branches/samba-3.3.x/source

Files:

• build.cmd (modified) (5 diffs)
• configure (modified) (1 diff)
• dynconfig.c (modified) (1 diff)
• lib/os2helper.c (modified) (2 diffs)
• pkgconfig/netapi.pc (deleted)
• pkgconfig/smbclient.pc (deleted)
• pkgconfig/smbsharemodes.pc (deleted)
• pkgconfig/wbclient.pc (deleted)
• script/findsmb (deleted)

branches/samba-3.3.x/source/build.cmd

@@ -5 +5 @@
 /* version 0.2.0 from 09.06.2010 Herwig (a lot enhancements) */
 /* version 0.3.0 from 20.08.2010 Silvan (added version.ecs check and more) */
+/* version 0.3.1 from 25.10.2011 Silvan (added cups support) */
 
 /* load the sysfuncs if not already loaded */
@@ -14 +15 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.0"
-version_date = "20.08.2010"
+version = "0.3.1"
+version_date = "25.10.2011"
 
 '@echo off'
@@ -47 +48 @@
 
 options = 'build.options'
+cacheFile = 'build.cache'
 
 /* defaults */
@@ -114 +116 @@
          --disable-cups          
      */
-    address cmd 'ksh ./configure --enable-pie=no --prefix=/samba --enable-static --disable-shared --disable-ldap --with-acl-support 2>&1 | tee configure.log'
+
+/* we need to delete the cache file and redo it afterwards */
+    ok = SysFileDelete(cacheFile);
+
+/* is cups env set */
+        sEnvVar = EnvGet('CUPS');
+    if sEnvVar <> '' then do
+    call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
+    end
+
+    ok = stream(cacheFile, 'c', 'close');
+
+/* run configure */
+    address cmd 'ksh ./configure --enable-pie=no --prefix=/samba --enable-static --disable-shared --with-acl-support --cache-file=build.cache 2>&1 | tee configure.log'
         address cmd 'ENDLOCAL'
 end
@@ -219 +234 @@
     say "Samba "verstring
 return 
+
+/**
+ * Gets the value of sEnvVar.
+ */
+EnvGet: procedure
+    parse arg sEnvVar
+    if ((translate(sEnvVar) = 'BEGINLIBPATH') | (translate(sEnvVar) = 'ENDLIBPATH')) then
+        return SysQueryExtLibPath(substr(sEnvVar, 1, 1));
+return value(sEnvVar,, 'OS2ENVIRONMENT');

branches/samba-3.3.x/source/configure

@@ -13193 +13193 @@
                 ac_save_LDFLAGS=$LDFLAGS
                 ac_save_PRINT_LIBS=$PRINT_LIBS
+                case "$host_os" in
+                                *os2*)
+                 PRINT_LIBS="$PRINT_LIBS -lcups -lpthread -lz"
+                                 ;;
+                                 *)
                 CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
                 LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
                 PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
+                                 ;;
+                 esac
                 for ac_header in cups/cups.h cups/language.h
 do :

branches/samba-3.3.x/source/dynconfig.c

@@ -295 +295 @@
         if (!*buffer)
         {
-                if (os2_isClient())
+                if (lp_is_in_client())
                 {
                         snprintf(buffer, 260, "%s/samba/lock/client", getenv("ETC"));

branches/samba-3.3.x/source/lib/os2helper.c

@@ -136 +136 @@
 
 // we search with the exe name if we are in client mode
+/* not used anymore, as lp_is_in_client() is used instead
 bool os2_isClient()
 {
@@ -153 +154 @@
         }
 }
-
+*/
 /* OS/2-specific random functions. these functions used to be based on APR 
    random code, but we discovered some nasty problems with it on fast hardware