s3:Makefile: fix libwbclient dependencies with static build

[ira/wip.git] / source3 / configure.in

diff --git a/source3/configure.in b/source3/configure.in
index a922e3fb7ee6732a70d195062f4bfb57426a6c17..9775ce4fff3fc5b963d678b7adf288d4f775c3de 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -72,7 +72,6 @@ AC_SUBST(LIBWBCLIENT_SHARED_TARGET)
 AC_SUBST(LIBWBCLIENT_SHARED)
 AC_SUBST(LIBWBCLIENT_STATIC_TARGET)
 AC_SUBST(LIBWBCLIENT_STATIC)
-AC_SUBST(LIBWBCLIENT_TARGET)
 AC_SUBST(LIBWBCLIENT_SOVER)
 AC_SUBST(LIBWBCLIENT)
 AC_SUBST(LIBWBCLIENT_LIBS)
@@ -743,7 +742,7 @@ if test x$enable_cups != xno; then
                ac_save_PRINT_LIBS=$PRINT_LIBS
                CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
                LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-               PRINT_LIBS="-lcups"
+               PRINT_LIBS="$PRINT_LIBS -lcups"
                AC_CHECK_HEADERS(cups/cups.h cups/language.h)
                if test x"$ac_cv_header_cups_cups_h" = xyes -a \
                        x"$ac_cv_header_cups_language_h" = xyes; then
@@ -1706,6 +1705,23 @@ fi
 
 AC_MSG_RESULT($BLDSHARED)
 
+if test x"${ac_cv_prog_gnu_ld}" = x"yes"; then
+       saved_ldflags="$LDFLAGS"
+       AC_MSG_CHECKING([if --as-needed works])
+       LDFLAGS="--as-needed $saved_ldflags"
+       AC_TRY_LINK([],[],
+               [AC_MSG_RESULT([yes])
+               LD_AS_NEEDED_FLAG=--as-needed],
+               AC_MSG_RESULT([no]))
+       AC_MSG_CHECKING([if -Wl,--as-needed works])
+       LDFLAGS="-Wl,--as-needed $saved_ldflags"
+       AC_TRY_LINK([],[],
+               [AC_MSG_RESULT([yes])
+               LD_AS_NEEDED_FLAG=-Wl,--as-needed],
+               AC_MSG_RESULT([no]))
+       LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
+fi
+
 AC_MSG_CHECKING([LDFLAGS])
 AC_MSG_RESULT([$LDFLAGS])
 AC_MSG_CHECKING([DYNEXP])
@@ -4117,12 +4133,12 @@ AC_ARG_WITH(cifsupcall,
 # /usr/include/pam.
 
 with_pam_for_crypt=no
-try_pam=no
+try_pam=auto
 AC_MSG_CHECKING(whether to try PAM support)
 AC_ARG_WITH(pam,
-[AS_HELP_STRING([--with-pam], [Include PAM support (default=no)])],
+[AS_HELP_STRING([--with-pam], [Include PAM support (default=auto)])],
 [ case "$withval" in
-  yes|no)
+  yes|no|auto)
     try_pam=$withval
     ;;
   esac
@@ -4809,47 +4825,6 @@ then
        AC_SUBST(TDBTORTURE)
 fi
 
-
-AC_ARG_ENABLE(external_liblua,
-       [AS_HELP_STRING([--enable-external-liblua],
-               [Enable external lua [default=auto]])],
-               [ enable_external_liblua=$enableval ],
-               [ enable_external_liblua=auto ])
-
-if test "x$enable_external_liblua" != xno
-then
-       PKG_CHECK_MODULES(LIBLUA, lua5.1 >= 5.1.4,
-               [ enable_external_liblua=yes ],
-               [
-               if test x$enable_external_liblua = xyes; then
-                       AC_MSG_ERROR([Unable to find liblua])
-               else
-                       enable_external_liblua=no
-               fi
-               ])
-fi
-
-AC_SUBST(LIBLUA_OBJ0)
-if test "x$enable_external_liblua" = xno
-then
-       LINK_LIBLUA=STATIC
-       SMB_LIBRARY(lua, 0)
-       LIBLUA_OBJ0="lua-5.1.4/src/lapi.o lua-5.1.4/src/lauxlib.o \
-               lua-5.1.4/src/lbaselib.o lua-5.1.4/src/lcode.o \
-               lua-5.1.4/src/ldblib.o lua-5.1.4/src/ldebug.o lua-5.1.4/src/ldo.o \
-               lua-5.1.4/src/ldump.o lua-5.1.4/src/lfunc.o lua-5.1.4/src/lgc.o \
-               lua-5.1.4/src/linit.o lua-5.1.4/src/liolib.o lua-5.1.4/src/llex.o \
-               lua-5.1.4/src/lmathlib.o lua-5.1.4/src/lmem.o \
-               lua-5.1.4/src/loadlib.o lua-5.1.4/src/lobject.o \
-               lua-5.1.4/src/lopcodes.o lua-5.1.4/src/loslib.o \
-               lua-5.1.4/src/lparser.o lua-5.1.4/src/lstate.o \
-               lua-5.1.4/src/lstring.o lua-5.1.4/src/lstrlib.o \
-               lua-5.1.4/src/ltable.o lua-5.1.4/src/ltablib.o lua-5.1.4/src/ltm.o \
-               lua-5.1.4/src/lundump.o lua-5.1.4/src/lvm.o \
-               lua-5.1.4/src/lzio.o lua-5.1.4/src/print.o"
-       AC_SUBST(LIBLUA_OBJ0)
-fi
-
 SMB_LIBRARY(netapi, 0)
 SMB_LIBRARY(smbclient, 0)
 SMB_LIBRARY(smbsharemodes, 0)
@@ -5987,14 +5962,12 @@ else
                ## Only worry about libwbclient if we have shared
                # library support
                LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-               LIBWBCLIENT_TARGET=$LIBWBCLIENT_SHARED_TARGET
                LIBWBCLIENT=libwbclient
                INSTALL_LIBWBCLIENT=installlibwbclient
                UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
                LIBWBCLIENT_LIBS="-lwbclient"
        else
                LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
-               LIBWBCLIENT_TARGET=$LIBWBCLIENT_STATIC_TARGET
                LIBWBCLIENT_LIBS=$LIBWBCLIENT_STATIC_TARGET
        fi
 fi