* demo/configure.in: set DLPREOPEN to -dlopen if we don't have

shared libraries
* demo/Makefile.am (DLPREOPEN): use instead of -dlpreopen
(STATIC): use $(STATIC), not @STATIC@
* mdemo/Makefile.am (STATIC): ditto
* demo/Makefile.am, mdemo/Makefile.am (STATIC): do not use

diff --git a/ChangeLog b/ChangeLog
index 03360e8a61b253f421a4a12b627d73a83a1c45ea..7f2bb194a3fe85c5d0438685958a9bf86d8d4a6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
 1999-01-21  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * demo/configure.in: set DLPREOPEN to -dlopen if we don't have
+       shared libraries
+       * demo/Makefile.am (DLPREOPEN): use instead of -dlpreopen
+       (STATIC): use $(STATIC), not @STATIC@
+       * mdemo/Makefile.am (STATIC): ditto
+
        * tests/demo-shared.test, tests/demo-static.test: new tests
        * tests/mdemo-shared.test, tests/mdemo-static.test: ditto
        * tests/Makefile.am: ditto
        * doc/libtool.texi: document them
-       * demo/Makefile.am, mdemo/Makefile.am (@STATIC@): do not use
+       * demo/Makefile.am, mdemo/Makefile.am (STATIC): do not use
        -static unconditionally, it can't work with --disable-static
        * demo/configure.in, mdemo/configure.in: check whether libtool was 
        configured to build static libraries and, if not, set STATIC to an 

diff --git a/demo/Makefile.am b/demo/Makefile.am
index 7cf94b32f97486f94616282bd86cb54e205cf0ed..b561d9df86f84aa5c94ec896bde451a957c8efbc 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -29,13 +29,13 @@ hell_LDADD = libhello.la
 # Create an easier-to-debug version of hell.
 hell_debug_SOURCES = main.c
 hell_debug_LDADD = libhello.la
-hell_debug_LDFLAGS = @STATIC@
+hell_debug_LDFLAGS = $(STATIC)
 
 if BINARY_HELLDL
 
 # Create a version of hell that does a preloaded dlopen.
 helldl_SOURCES = dlmain.c
-helldl_LDFLAGS = -export-dynamic -dlpreopen libhello.la
+helldl_LDFLAGS = -export-dynamic $(DLPREOPEN) libhello.la
 helldl_DEPENDENCIES = libhello.la
 
 else

diff --git a/demo/configure.in b/demo/configure.in
index e0fac772d0971e55cb5a198050bd0d70fd6411c6..8f99a3eb4a56cded993d62baa12295a372380f96 100644 (file)
--- a/demo/configure.in
+++ b/demo/configure.in
@@ -9,10 +9,13 @@ AM_PROG_LIBTOOL
 
 if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
   STATIC=-static
+  DLPREOPEN=-dlpreopen
 else
   STATIC=
+  DLPREOPEN=-dlopen
 fi
 AC_SUBST(STATIC)
+AC_SUBST(DLPREOPEN)
 
 AM_CONDITIONAL(BINARY_HELLDL, [dnl
 grep '^global_symbol_pipe=..*$' ./libtool >/dev/null])

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index b56c2ecaafd379eebf62a2af3c42c53bb9089bd0..a5675a41837b301b2d8fa541551949201f9e76dd 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -32,6 +32,6 @@ mdemo_DEPENDENCIES = ../libltdl/libltdlc.la foo1.la libfoo2.la
 
 # Create an easier-to-debug version of mdemo.
 mdemo_debug_SOURCES = $(mdemo_SOURCES)
-mdemo_debug_LDFLAGS = @STATIC@ $(mdemo_LDFLAGS)
+mdemo_debug_LDFLAGS = $(STATIC) $(mdemo_LDFLAGS)
 mdemo_debug_LDADD = $(mdemo_LDADD)
 mdemo_debug_DEPENDENCIES = $(mdemo_DEPENDENCIES)