r19621: move enable-dso to check_ld.m4 again and add some checks and generate more...

metze
(This used to be commit a07b11924c16d51cda484d417d9e1201278b03cb)

diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
index 9428f62040d85c7b7b120d1cd9595adcb6829b9c..1b1c6e92c613fd2860a8e6e3a9e36cb4813dfa2f 100644 (file)
--- a/source4/build/m4/check_ld.m4
+++ b/source4/build/m4/check_ld.m4
@@ -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])

diff --git a/source4/configure.ac b/source4/configure.ac
index ac7998ba5f390ac313118e7010fff171c13d4e59..56814712179c3b71e74fe3bdb71990d860e739d0 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -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}"