diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-11-07 14:13:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:17 -0500 |
| commit | 84e08dad218dce505b76b36dc74c98548edcefeb (patch) | |
| tree | 0df54e054d6a72a9d0a3e5373eb6a9926b140e82 | |
| parent | 8b063f9843d46a9b539f4295a762c65c21c6aa64 (diff) | |
| download | samba-84e08dad218dce505b76b36dc74c98548edcefeb.tar.gz samba-84e08dad218dce505b76b36dc74c98548edcefeb.tar.bz2 samba-84e08dad218dce505b76b36dc74c98548edcefeb.zip | |
r19621: move enable-dso to check_ld.m4 again and add some checks and generate more output
metze
(This used to be commit a07b11924c16d51cda484d417d9e1201278b03cb)
| -rw-r--r-- | source4/build/m4/check_ld.m4 | 18 | ||||
| -rw-r--r-- | source4/configure.ac | 11 |
2 files changed, 18 insertions, 11 deletions
diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4 index 9428f62040..1b1c6e92c6 100644 --- 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 ac7998ba5f..5681471217 100644 --- 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}" |