[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1518-g2e87661

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  2e8766145ad2e8c666ecdc6c39e97ba302b16e04 (commit)
      from  ef53ffbc24cc4959acb773f27e72e90b603e81d7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 2e8766145ad2e8c666ecdc6c39e97ba302b16e04
Author: Jelmer Vernooij <jelmer@xxxxxxxxx>
Date:   Sun May 11 15:37:09 2008 +0200

    Fail earlier on if shared libs can't be built.

-----------------------------------------------------------------------

Summary of changes:
 source/build/m4/check_ld.m4 |   34 +++++-----------------------------
 1 files changed, 5 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/check_ld.m4 b/source/build/m4/check_ld.m4
index 0d0742e..3a74ffc 100644
--- a/source/build/m4/check_ld.m4
+++ b/source/build/m4/check_ld.m4
@@ -151,36 +151,12 @@ if test $BLDSHARED = true; then
                                ac_cv_shmod_works=yes
                        rm -f shlib.${SHLIBEXT} shlib.o
        ])
-       if test $ac_cv_shlib_works = no -o $ac_cv_shmod_works = no; then
-               BLDSHARED=false
+       if test $ac_cv_shlib_works = no; then
+               AC_MSG_ERROR(unable to build shared libraries)
+       fi
+       if test $ac_cv_shmod_works = no; then
+               AC_MSG_ERROR(unable to build shared modules)
        fi
-fi
-
-if test $BLDSHARED != true; then
-       SHLD="shared-libraries-disabled"
-       SHLD_FLAGS="shared-libraries-disabled"
-       MDLD="shared-modules-disabled"
-       MDLD_FLAGS="shared-modules-disabled"
-       SHLIBEXT="shared_libraries_disabled"
-       SONAMEFLAG="shared-libraries-disabled"
-       PICFLAG=""
-       AC_MSG_CHECKING([SHLD])
-       AC_MSG_RESULT([$SHLD])
-       AC_MSG_CHECKING([SHLD_FLAGS])
-       AC_MSG_RESULT([$SHLD_FLAGS])
-
-       AC_MSG_CHECKING([MDLD])
-       AC_MSG_RESULT([$MDLD])
-       AC_MSG_CHECKING([MDLD_FLAGS])
-       AC_MSG_RESULT([$MDLD_FLAGS])
-
-       AC_MSG_CHECKING([SHLIBEXT])
-       AC_MSG_RESULT([$SHLIBEXT])
-       AC_MSG_CHECKING([SONAMEFLAG])
-       AC_MSG_RESULT([$SONAMEFLAG])
-
-       AC_MSG_CHECKING([PICFLAG])
-       AC_MSG_RESULT([$PICFLAG])
 fi
 
 AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])


-- 
Samba Shared Repository