From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 4 Sep 2000 04:33:51 +0000 (+0000)
Subject: * mdemo/configure.in: Don't use -static on AIX4.1.
X-Git-Tag: release-1-3d~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3244d1b086d68de3901069124f5f28f4aa1fc90a;p=thirdparty%2Flibtool.git

* mdemo/configure.in: Don't use -static on AIX4.1.
* mdemo/Makefile.am: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 134162bb7..9e46baace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
+
+	* mdemo/configure.in: Don't use -static on AIX4.1.
+	* mdemo/Makefile.am: Likewise.
+
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>
 
 	* ltconfig.in: Get rid of hardcode_into_libs=all; use
diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 4ca188f27..e721c721d 100644
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -42,7 +42,7 @@ mdemo_DEPENDENCIES = @LIBLTDL@ libsub.la foo1.la libfoo2.la
 
 # Create a statically linked version of mdemo.
 mdemo_static_SOURCES = $(mdemo_SOURCES)
-mdemo_static_LDFLAGS = $(mdemo_LDFLAGS) -static
+mdemo_static_LDFLAGS = $(STATIC) $(mdemo_LDFLAGS)
 mdemo_static_LDADD = $(mdemo_LDADD)
 mdemo_static_DEPENDENCIES = $(mdemo_DEPENDENCIES)
 
diff --git a/mdemo/configure.in b/mdemo/configure.in
index 4ea7cbe53..669b7ce38 100644
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -16,6 +16,20 @@ AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
+if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
+  STATIC=-static
+else
+  STATIC=
+fi
+AC_SUBST(STATIC)
+
+case $host_os in
+dnl aix 4.1 provides dlopen() through -lsvld, but this library can't
+dnl be linked statically.
+aix4.[[01]]*)
+  STATIC= ;;
+esac
+
 AC_CHECK_HEADERS(math.h)
 
 AC_CHECK_LIBM