svn commit: samba r20814 - in branches/SAMBA_4_0/source/build/m4: .

[metze at samba.org]

Author: metze
Date: 2007-01-15 18:44:06 +0000 (Mon, 15 Jan 2007)
New Revision: 20814

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20814

Log:
always define SHLIBEXT, to fix the build on host with no support for shared libs,
there we just define it to an invalid value

metze
Modified:
   branches/SAMBA_4_0/source/build/m4/check_ld.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4	2007-01-15 18:38:43 UTC (rev 20813)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4	2007-01-15 18:44:06 UTC (rev 20814)
@@ -154,34 +154,55 @@
 # test whether building a shared library actually works
 if test $BLDSHARED = true; then
 
-AC_MSG_CHECKING([SHLD])
-AC_MSG_RESULT([$SHLD])
-AC_MSG_CHECKING([SHLD_FLAGS])
-AC_MSG_RESULT([$SHLD_FLAGS])
+	AC_MSG_CHECKING([SHLD])
+	AC_MSG_RESULT([$SHLD])
+	AC_MSG_CHECKING([SHLD_FLAGS])
+	AC_MSG_RESULT([$SHLD_FLAGS])
 
-AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
-AC_MSG_CHECKING([SHLIBEXT])
-AC_MSG_RESULT([$SHLIBEXT])
-AC_MSG_CHECKING([SONAMEFLAG])
-AC_MSG_RESULT([$SONAMEFLAG])
+	AC_MSG_CHECKING([SHLIBEXT])
+	AC_MSG_RESULT([$SHLIBEXT])
+	AC_MSG_CHECKING([SONAMEFLAG])
+	AC_MSG_RESULT([$SONAMEFLAG])
 
-AC_MSG_CHECKING([PICFLAG])
-AC_MSG_RESULT([$PICFLAG])
+	AC_MSG_CHECKING([PICFLAG])
+	AC_MSG_RESULT([$PICFLAG])
 
-AC_CACHE_CHECK([whether building shared libraries actually works], 
-               [ac_cv_shlib_works],[
-   ac_cv_shlib_works=no
-   # try building a trivial shared library
-   ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o &&
-       ${SHLD} `eval echo ${SHLD_FLAGS} ` -o shlib.${SHLIBEXT} shlib.o &&
-       ac_cv_shlib_works=yes
-   rm -f shlib.${SHLIBEXT} shlib.o
-])
-if test $ac_cv_shlib_works = no; then
-   BLDSHARED=false
+	AC_CACHE_CHECK([whether building shared libraries actually works], 
+	               [ac_cv_shlib_works],[
+			ac_cv_shlib_works=no
+			# try building a trivial shared library
+			${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o &&
+				${SHLD} `eval echo ${SHLD_FLAGS} ` -o shlib.${SHLIBEXT} shlib.o && 
+				ac_cv_shlib_works=yes
+			rm -f shlib.${SHLIBEXT} shlib.o
+	])
+	if test $ac_cv_shlib_works = no; then
+		BLDSHARED=false
+	fi
 fi
+
+if test $BLDSHARED != true; then
+	SHLD="shared-libraries-disabled"
+	SHLD_FLAGS="shared-libraries-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([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])
+
 AC_MSG_CHECKING([if we can link using the selected flags])
 AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
 	    AC_MSG_RESULT(yes),