Changeset 478 for vendor/current/source3/configure.in

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

File:

• vendor/current/source3/configure.in (modified) (13 diffs)

vendor/current/source3/configure.in

@@ -209 +209 @@
 AC_CHECK_TOOL(AR, ar)
 
-dnl Check if we use GNU ld
-LD=ld
+dnl Check if we (actually our C compiler!) use GNU ld
 AC_PROG_LD_GNU
 
@@ -217 +216 @@
 dnl warnings when building modules.
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
-        ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
+        ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1`
         AC_MSG_CHECKING(GNU ld release date)
         changequote(,)dnl
@@ -263 +262 @@
 AC_SUBST(BROKEN_CC)
 
-dnl Check if the C compiler understands -Werror
+dnl Check if the C compiler understands -Werror (GNU)
 AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
  AC_TRY_RUN_STRICT([
@@ -285 +284 @@
    Werror_FLAGS="-w2"
 else
-dnl Check if the C compiler understands -errwarn
+dnl Check if the C compiler understands -errwarn (Sun)
 AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn, [
   AC_TRY_RUN_STRICT([
@@ -295 +294 @@
 if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
    Werror_FLAGS="-errwarn=%all"
+else
+dnl Check if the C compiler understands -qhalt (IBM)
+AC_CACHE_CHECK([that the C compiler understands -qhalt],samba_cv_HAVE_qhalt, [
+  AC_TRY_RUN_STRICT([
+   int main(void)
+   {
+        return 0;
+   }],[$CFLAGS -qhalt=w],[$CPPFLAGS],[$LDFLAGS],
+   samba_cv_HAVE_qhalt=yes,samba_cv_HAVE_qhalt=no,samba_cv_HAVE_qhalt=cross)])
+if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
+   Werror_FLAGS="-qhalt=w"
+fi
 fi
 fi
@@ -1426 +1437 @@
                 cat > conftest.c <<EOF
 int foo;
-main () { return 0;}
+int main () { return 0;}
 EOF
-                if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
+                if AC_TRY_COMMAND_NO_STDERR([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c])
                 then
                         samba_cv_fpie=yes
@@ -1511 +1522 @@
                 *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
                         BLDSHARED="true"
-                        LDSHFLAGS="-G"
-                        SONAMEFLAG="-h "
                         if test "${GCC}" = "yes"; then
                                 PICFLAG="-fPIC"
@@ -1519 +1528 @@
                                         DYNEXP="-Wl,-E"
                                 fi
+                                LDSHFLAGS="-shared"
                         else
                                 PICFLAG="-KPIC"
-                                ## ${CFLAGS} added for building 64-bit shared
-                                ## libs using Sun's Compiler
-                                LDSHFLAGS="-G \${CFLAGS}"
+                                LDSHFLAGS="-G"
+                        fi
+                        if test "$ac_cv_prog_gnu_ld" = "yes"; then
+                                SONAMEFLAG="-Wl,-soname="
+                        else
+                                SONAMEFLAG="-Wl,-h,"
                         fi
                         AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
@@ -1559 +1572 @@
                         esac
                         BLDSHARED="true"
-                        LDSHFLAGS="-set_version sgi1.0 -shared"
-                        SONAMEFLAG="-soname "
-                        SHLD="\${LD}"
+                        LDSHFLAGS="-Wl,-set_version,sgi1.0 -shared"
+                        SONAMEFLAG="-Wl,-soname,"
                         if test "${GCC}" = "yes"; then
                                 PICFLAG="-fPIC"
@@ -1580 +1592 @@
                         if test "${GCC}" != "yes"; then
                                 ## for funky AIX compiler using strncpy()
-                                CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
+                                CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000 -qhalt=e"
                         fi
 
@@ -1694 +1706 @@
 AC_MSG_RESULT($BLDSHARED)
 
+saved_before_as_needed_ldflags="$LDFLAGS"
 for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
         saved_ldflags="$LDFLAGS"
@@ -1707 +1720 @@
 done
 
+# check if we have to disable LD_AS_NEEDED_FLAG:
+# On some systems for a veriety of reasons linking with
+# -Wl,--as-needed -lreadline -lncurses fails
+# we have to retest, if these combination is detected before.
+# Bugzilla #7209
+
+if test x$ac_cv_lib_readline_rl_callback_handler_install = xyes ; then
+        if test x$ld_as_needed_flag_found = xyes ; then
+                AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG works with readline])
+                # try if check no fails
+                save_LIBS=$LIBS
+                LIBS="$LIBS $TERMLIBS"
+                AC_TRY_LINK([], [rl_callback_handler_install();], [AC_MSG_RESULT([yes])],[ AC_MSG_RESULT([no]); LDFLAGS="$saved_before_as_needed_ldflags"])
+                LIBS="$save_LIBS"
+        fi
+fi
+
+
+
 # for historical reasons almost all linkers don't complain about unresolved
 # symbols in shared libs. Except for the internal samba modules we want to get
@@ -1759 +1791 @@
    # The $SHLD and $LDSHFLAGS variables may contain references to other
    # variables so they need to be eval'ed.
-   $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o \
-        shlib.o ${srcdir-.}/../tests/shlib.c && \
-   `eval echo $SHLD` `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" \
-        shlib.o && ac_cv_shlib_works=yes
+   if AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&AS_MESSAGE_LOG_FD])
+   then
+     if AC_TRY_COMMAND([`eval echo "$SHLD $LDSHFLAGS $PICFLAG"` -o "shlib.$SHLIBEXT" shlib.o 1>&AS_MESSAGE_LOG_FD])
+     then
+       ac_cv_shlib_works=yes
+     fi
+   fi
    rm -f "shlib.$SHLIBEXT" shlib.o