r19621: move enable-dso to check_ld.m4 again and add some checks and generate more...
authorStefan Metzmacher <metze@samba.org>
Tue, 7 Nov 2006 14:13:59 +0000 (14:13 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:25:17 +0000 (14:25 -0500)
metze

source/build/m4/check_ld.m4
source/configure.ac

index 9428f62..1b1c6e9 100644 (file)
@@ -185,3 +185,21 @@ AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
            AC_MSG_RESULT(yes),
            AC_MSG_ERROR([we cannot link with the selected cc and ld flags. Aborting configure]),
            AC_MSG_WARN([cannot run when cross-compiling]))
+
+try_dso=no
+USESHARED=false
+AC_SUBST(USESHARED)
+
+AC_ARG_ENABLE(dso,
+[  --enable-dso                Enable using shared libraries internally (experimental)])
+
+if test x"$enable_dso" = x"yes" -a x"$BLDSHARED" != x"true"; then
+       AC_MSG_ERROR([--enable-dso: no support for shared libraries])
+fi
+
+if test x"$enable_dso" != x"no"; then
+       USESHARED=$BLDSHARED
+fi
+
+AC_MSG_CHECKING([if binaries will use shared libraries])
+AC_MSG_RESULT([$USESHARED])
index ac7998b..5681471 100644 (file)
@@ -50,17 +50,6 @@ m4_include(lib/appweb/config.m4)
 m4_include(nsswitch/config.m4)
 m4_include(libcli/config.m4)
 
-USESHARED=$BLDSHARED
-
-AC_ARG_ENABLE(dso,
-[  --enable-dso                Enable using shared libraries internally (experimental)],
-[ if test x$enable_dso != xno; then
-       USESHARED=true
-  fi], 
-[USESHARED=false])
-
-AC_SUBST(USESHARED)
-
 #################################################
 # add *_CFLAGS only for the real build
 CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"