From 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 May 2008 15:37:09 +0200
Subject: Fail earlier on if shared libs can't be built. (This used to be
 commit 2e8766145ad2e8c666ecdc6c39e97ba302b16e04)

---
 source4/build/m4/check_ld.m4 | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'source4/build/m4')

diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
index 0d0742e5d2..3a74ffc239 100644
--- a/source4/build/m4/check_ld.m4
+++ b/source4/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])
-- 
cgit