Changeset 824 for branches/samba-3.5.x

Timestamp:

Nov 6, 2013, 4:23:30 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: configure adjustment for iconv, don't replace getpas

Location:

branches/samba-3.5.x

Files:

• lib/replace/system/passwd.h (modified) (1 diff)
• source3/build.cmd (modified) (4 diffs)
• source3/configure (modified) (2 diffs)

branches/samba-3.5.x/lib/replace/system/passwd.h

@@ -68 +68 @@
 #endif
 
-#if defined(REPLACE_GETPASS) && !defined(__OS2__)
+#if defined(REPLACE_GETPASS)
 #if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
 #define getpass(prompt) getpassphrase(prompt)

branches/samba-3.5.x/source3/build.cmd

@@ -22 +22 @@
 /* version 0.3.13 from 15.08.2013 Herwig (create build_anomalies.log, codepages 
                                           to ZIP, libc065 switching) */
-/* version 1.0.0 from 06.11.2013 Silvan (conf has to create version.h also) */
+/* version 1.0.0 from 06.11.2013 Silvan (conf has to create version.h also,
+                                         don't check for env anymore, use sh only */
                                          
 /* load the sysfuncs if not already loaded */
@@ -62 +63 @@
 end
 
-if value('MOZENV',,'OS2ENVIRONMENT') = '' then do
-   say "Please set GCC environment properly!"
-   exit 254
-end
-
 logFile   = 'build.log'
 options   = 'build.options'
@@ -148 +144 @@
         call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
     end
+
+/* our libc provides a correct getpass(), so no need to replace */
+    call lineout cacheFile, "libreplace_cv_REPLACE_GETPASS=no";
 
 /* is python env set */
@@ -298 +297 @@
     ok = stream(Version,'c','close')
     ok = stream(NewVersion,'c','close')
-    address cmd "ksh ./script/mkversion.sh "NewVersion" >NUL"
+    address cmd "sh ./script/mkversion.sh "NewVersion" >NUL"
     ok = SysFileDelete(NewVersion)
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')

branches/samba-3.5.x/source3/configure

@@ -21394 +21394 @@
 
 
-ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
+ICONV_LOOK_DIRS="/@unixroot/usr /usr /usr/local /sw /opt"
 
 # Check whether --with-libiconv was given.
@@ -21634 +21634 @@
             # We found iconv in libc.
             iconv_current_LIBS=""
+            iconv_current_LDFLAGS=""
+            iconv_current_CPPFLAGS=""
         fi