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

* mdemo/Makefile.am: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 134162bb742e2056b6156aac0b3cf84eb4e73d64..9e46baaceb22741efdfa30241d2cfe81d7137c39 100644 (file)
--- 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 4ca188f2704d3d186642433b8cdbeecc9a6845e1..e721c721d8e61c474e7263defca7912807102f1f 100644 (file)
--- 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 4ea7cbe53d081660ec30b8f6b219c1f0a1c651d2..669b7ce387aab56e1319db4c5625567a2fd78530 100644 (file)
--- 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