*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ea1fa1149b1f04512a6de9af08fbb27e2621c7bf..c437fde24959ce30eb3f41b95122cf0071381167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-01-05  Thomas Tanner  <tanner@gmx.de>
+
+       * configure.in: do not configure libltdl by default
+       * Makefile.am: do not build libltdl by default
+       * libltdl/Makefile.am: ltdls.lo depends on libtool
+       * tests/Makefile.am: before starting the tests 
+         make sure that libtool was build
+       * tests/mdemo-conf.test: configure libltdl
+       * tests/mdemo-make.test: build libltdl
+               
 1999-01-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltmain.in (SP2NL, NL2SP): Don't delete empty lines, as this

diff --git a/Makefile.am b/Makefile.am
index f78a8ec73f283abcbad5eb20c29663af07104efa..4f2bc74955bb010d868bddd51a958e92e11de73d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## Process Makefile.am with automake to create Makefile.in. -*-Makefile-*-
 ## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 AUTOMAKE_OPTIONS = gnits
-SUBDIRS = . doc tests libltdl
-DIST_SUBDIRS = $(SUBDIRS) demo mdemo
+SUBDIRS = . doc tests
+DIST_SUBDIRS = $(SUBDIRS) demo libltdl mdemo
 
 # We need to export these variables when we run ltconfig.
 CFLAGS = @CFLAGS@
@@ -61,8 +61,8 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in
 # We use our own libtool.m4 for these.
 ACINCLUDE_M4_LIST = \
        $(srcdir)/acinclude.m4 \
-       $(srcdir)/libltdl/acinclude.m4 \
        $(srcdir)/demo/acinclude.m4 \
+       $(srcdir)/libltdl/acinclude.m4 \
        $(srcdir)/mdemo/acinclude.m4
 
 # All our rules should depend on these demo files.

diff --git a/configure.in b/configure.in
index 8fbd3a920430607d02b34232327863e18ed1d670..a7304de65ebc4dba9e839702235f3a15d07cac6a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,8 +18,6 @@ AC_PROG_LN_S
 dnl For the `lineno' script (which puts line numbers into `ltconfig').
 AC_PROG_AWK
 
-AC_CONFIG_SUBDIRS(libltdl)
-
 AC_OUTPUT([Makefile doc/Makefile tests/Makefile])
 
 # Local Variables:

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index c4dc80f6e0b4d4257b6edb01be03707756b76682..97a227bb9df17351db24a3e1571ea0eb9ec4cf4a 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign
 
 LTDL_VERSION = -version-info 0:1:0
 
-ltdls.lo: ltdl.c
+ltdls.lo: ltdl.c libtool
        $(LTCOMPILE) -DUSE_DLPREOPEN -o $@ -c $<
 
 lib_LTLIBRARIES = @LIBLIBS@

diff --git a/ltmain.in b/ltmain.in
index 72a0f76ccd3783c390381d4cdf3af4b87dfe2b39..9c66bcece2df13d8b4caa812ee4dd111bb84c5d5 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2060,9 +2060,9 @@ dld_preloaded_symbols[] =
 
       # Only actually do things if our run command is non-null.
       if test -z "$run"; then
-        # win32 will think the script is a binary if it has
+       # win32 will think the script is a binary if it has
        # a .exe suffix, so we strip it off here.
-        case $output in
+       case $output in
          *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
        esac
        $rm $output

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b875071c353f1bfc7c78b82f3c3f44fb67ff423..a3fd4bedd65f1b1868e1b9e3d42aced25d83ab06 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,11 @@ TESTS = demo-conf.test demo-make.test demo-exec.test \
        link.test link-2.test nomode.test \
        quote.test sh.test suffix.test
 
+demo-conf.test: $(top_builddir)/libtool
+
+$(top_builddir)/libtool:
+       cd $(top_builddir) && $(MAKE) all
+
 # Be sure to reexport important environment variables.
 TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" NM="$(NM)" RANLIB="$(RANLIB)" LN_S="$(LN_S)"

diff --git a/tests/mdemo-conf.test b/tests/mdemo-conf.test
index d74b13563b201945419fa925b68f27a86042a73c..edef225df1521975d8c51c620f4bd20f4bccd95b 100755 (executable)
--- a/tests/mdemo-conf.test
+++ b/tests/mdemo-conf.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# mdemo-conf.test - try configuring the ../mdemo subdirectory
+# mdemo-conf.test - try configuring the ../libltdl and ../mdemo subdirectories
 
 # Test script header.
 need_prefix=yes
@@ -10,6 +10,23 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
+# Maybe we have a VPATH build, in which case, create a new subdir.
+test -d ../libltdl || mkdir ../libltdl
+
+# Change to our build directory.
+cd ../libltdl || exit 1
+
+# Possibly clean up the distribution.
+if test -f Makefile; then
+  echo "= Running $make distclean in ../libltdl"
+  $make distclean
+fi
+rm -f config.cache
+
+# Configure libltdl.
+echo "= Configuring in ../libltdl (prefix=$prefix)"
+CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../libltdl/configure --srcdir=$srcdir/../libltdl --prefix=$prefix || exit 1
+
 # Maybe we have a VPATH build, in which case, create a new subdir.
 test -d ../mdemo || mkdir ../mdemo
 

diff --git a/tests/mdemo-make.test b/tests/mdemo-make.test
index 7c79d3b707e922984a54f32f5525d88bdd49020d..17c12e2bbca064f69e7866095018af92ae39c73a 100755 (executable)
--- a/tests/mdemo-make.test
+++ b/tests/mdemo-make.test
@@ -10,19 +10,19 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
-# Check that things are built.
-if test -f ../libltdl/libltdl.la; then :
-else
-  echo "You must built libltdl before $0" 1>&2
-  exit 1
-fi
-
-if test -f ../mdemo/Makefile; then :
+if test -f ../libltdl/Makefile && test -f ../mdemo/Makefile; then :
 else
   echo "You must run mdemo-conf.test before running $0" 1>&2
   exit 1
 fi
 
+# Change to our build directory.
+cd ../libltdl || exit 1
+
+# Do the actual build.
+echo "Making in ../libltdl"
+$make || exit 1
+
 # Change to our build directory.
 cd ../mdemo || exit 1