*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index a6783bdf0f65a65329c493197e1a767c827510d5..57f2e3f10b8b90c6724ff85860b06b18841b84d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,23 @@
 
        * autogen: fake the libtool scripts to help fixing
          the bootstrapping problem
-               
+       * Makefile.am: always configure libltdl, however after building
+         the libtool scripts, 
+         build the libtool scripts in builddir, not srcdir
+         (unfortunately this breaks building when srcdir!=objdir, 
+          but it was just plain wrong - need's to be fixed),
+         build and install libltdl.tar.gz,
+         copy acinclude.m4 instead of linking them, so that we 
+         can 'make dist' in libltdl,
+         fix configuring of subdirectories
+       * configure.in: remove --enable-ltdl-install - libltdl is supposed
+         to be installed by packages, not by libtool itself
+       * libtoolize.in: new flags --ltdl and --ltdl-tar to install libltdl
+         in packages (--ltdl doesn't work yet),
+         install only the necessary libtool scripts, not just all 
+         files in pkgdatadir
+       * mdemo/Makefile.am: remove rule for libltdl configuration
+                       
 1999-01-13  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * mdemo/Makefile.am (../libltdl/libtool): mkdir and configure

diff --git a/Makefile.am b/Makefile.am
index 9c5270ac81b9b16603656cc9dbc4ad36bef7b477..1f4a6fcd78ecf1f013e6a7229ce4405bbf0d107a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 AUTOMAKE_OPTIONS = 1.3e gnits readme-alpha
 
 BUILD_SUBDIRS = . doc tests
-SUBDIRS = $(BUILD_SUBDIRS) $(BUILD_LTDL)
+SUBDIRS = $(BUILD_SUBDIRS)
 DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
 
 # We need to export these variables when we run ltconfig.
@@ -15,12 +15,11 @@ aclocal_macros = libtool.m4
 
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \
        libtool.spec
-CLEANFILES = libtool libtoolize
-MAINTAINERCLEANFILES = ltconfig ltmain.sh
+CLEANFILES = libtool libtoolize ltconfig ltmain.sh
 
 # These are required by libtoolize.
 pkgdata_SCRIPTS = config.guess config.sub ltconfig
-pkgdata_DATA = ltmain.sh
+pkgdata_DATA = ltmain.sh libltdl.tar.gz
 
 # This macro file should be visible to Automake's aclocal.
 aclocaldir = @aclocaldir@
@@ -29,20 +28,21 @@ aclocal_DATA = $(aclocal_macros)
 # The standalone libtool script, and the libtool distributor.
 bin_SCRIPTS = libtool libtoolize
 
-LIBTOOL_DEPS = $(srcdir)/ltmain.sh $(srcdir)/ltconfig
+libltdl.tar.gz: libltdl/Makefile
+       (cd libltdl && $(MAKE) dist)
+       rm -f libltdl.tar.gz
+       ln -s libltdl/libltdl-0.1.tar.gz libltdl.tar.gz
 
-libtool: $(LIBTOOL_DEPS)
+libtool: ltmain.sh ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-       $(SHELL) $(srcdir)/ltconfig --srcdir=$(srcdir) --output=$@ \
-         $(srcdir)/ltmain.sh
+       $(SHELL) ltconfig --srcdir=$(srcdir) --output=$@ ltmain.sh
 
 # Experimental C version of libtool.
-clibtool: $(srcdir)/ltmain.c $(srcdir)/ltconfig
+clibtool: $(srcdir)/ltmain.c ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
        LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-       $(SHELL) $(srcdir)/ltconfig --srcdir=$(srcdir) --output=$@ \
-         $(srcdir)/ltmain.c
+       $(SHELL) ltconfig --srcdir=$(srcdir) --output=$@ $(srcdir)/ltmain.c
 
 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
        CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
@@ -50,14 +50,14 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
 
 # Do line number substitution, as well as PACKAGE and VERSION.
 # Line numbering transliterated from a section in autoconf (Autoconf 2.12).
-$(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in
+ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in
        $(AWK) '/@LINENO@/ { printf "%d:", NR } { print }' $(srcdir)/ltconfig.in | \
          sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
              -e '/@LINENO@/s/^\([0-9][0-9]*\):\(.*\)@LINENO@/\2\1/' > ltconfig.T
        chmod +x ltconfig.T
        mv -f ltconfig.T $@
 
-$(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in
+ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in
        sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' $(srcdir)/ltmain.in > ltmain.shT
        mv -f ltmain.shT $@
 
@@ -67,14 +67,15 @@ all-local check-local: $(ACINCLUDE_M4_LIST) libtool
 @ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
        rm -f $@
        cd `echo $@ | sed 's,/[^/]*$$,,'` && \
-         $(LN_S) `echo $@ | sed -e 's|^$(srcdir)/||' -e 's,[^/]*$$,,' -e 's,[^/][^/]*,..,g'`libtool.m4 acinclude.m4
+       cp $(srcdir)/libtool.m4 acinclude.m4
 
 .PHONY: configure-subdirs
 configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
 @DIST_MAKEFILE_LIST@:
        dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
        test -d $$dir || mkdir $$dir || exit 1; \
-       (cd $$dir && $(srcdir)/$$dir/configure) || exit 1
+       save=`pwd` && cd $(top_srcdir) && abs_srcdir=`pwd` && cd $$save; \
+       (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
 
 ################################################################
 ##

diff --git a/autogen b/autogen
index e3b14c8f7db5b7e692d52344bf1baeb4e24cebad..2444c90008c990785d51b085eb77340ecc08a8c7 100644 (file)
--- a/autogen
+++ b/autogen
@@ -6,18 +6,18 @@
 
 rm -f acinclude.m4
 ln -s libtool.m4 acinclude.m4
+aclocal
+automake --gnits --add-missing
+autoconf
 # fake the libtool scripts
 touch ltconfig
 touch ltmain.sh
 touch libtoolize
-aclocal
-automake --gnits --add-missing
-autoconf
 
 for sub in demo depdemo libltdl mdemo cdemo; do
   cd $sub
   rm -f acinclude.m4
-  ln -s ../libtool.m4 acinclude.m4
+  cp ../libtool.m4 acinclude.m4
   aclocal
   automake --gnits --add-missing
   autoconf

diff --git a/configure.in b/configure.in
index e768d7c1b19255bcfda075f49ed3252925a0f653..54d6e0d8f3052d347d180f6f3e33ac5adbb92063 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,16 +8,6 @@ AC_SUBST(pkgdatadir)
 aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)
 
-AC_ARG_ENABLE(ltdl-install,
-  [  --enable-ltdl-install   install libltdl])
-AM_CONDITIONAL(INSTALL_LTDL, test x$enable_ltdl_install = xyes)
-if test x$enable_ltdl_install = xyes; then
-  BUILD_LTDL=libltdl
-else
-  BUILD_LTDL=
-fi
-AC_SUBST(BUILD_LTDL)
-
 dnl Use the specified CC, RANLIB, and LD while running ltconfig.
 AC_PROG_CC
 AC_PROG_RANLIB
@@ -42,7 +32,6 @@ done
 AC_SUBST(ACINCLUDE_M4_LIST)
 AC_SUBST(DIST_MAKEFILE_LIST)
 
-AC_CONFIG_SUBDIRS($BUILD_LTDL)
 AC_OUTPUT([Makefile doc/Makefile tests/Makefile])
 
 # Local Variables:

diff --git a/libtoolize.in b/libtoolize.in
index 880b01ebf3d240999bf5d5e1ea3236ddd375501a..09510795da6c893eb5f6f59b38df74de0fbe0604 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -49,6 +49,8 @@ cp="cp -f"
 automake=
 copy=
 force=
+ltdl=
+ltdl_tar=
 status=0
 
 for arg
@@ -66,6 +68,8 @@ Prepare a package to use libtool.
 -n, --dry-run         print commands rather than running them
 -f, --force           replace existing files
     --help            display this message and exit
+    --ltdl            install libltdl in a subdirectory
+    --ltdl-tar        install the libltdl tarball
     --version         print version information and exit
 
 You must \`cd' to the top directory of your package before you run
@@ -105,6 +109,16 @@ EOF
     force=yes
     ;;
 
+  --ltdl)
+    ltdl=yes
+    ltdl_tar=
+    ;;
+
+  --ltdl-tar)
+    ltdl=
+    ltdl_tar=yes
+    ;;
+
   -*)
     echo "$progname: unrecognized option \`$arg'" 1>&2
     echo "$help" 1>&2
@@ -125,11 +139,14 @@ if test ! -f configure.in; then
   exit 1
 fi
 
-files=`cd $pkgdatadir && ls`
-if test -z "$files"; then
+
+if cd $pkgdatadir && ls; then :
+else
   echo "$progname: cannot list files in \`$pkgdatadir'" 1>&2
   exit 1
 fi
+files='config.guess config.sub ltconfig ltmain.sh'
+test "x$ltdl_tar" = xyes && files="$files libltdl.tar.gz"
 
 auxdir=.
 auxdirline=`egrep '^AC_CONFIG_AUX_DIR' configure.in 2>/dev/null`

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index dcc5659232c75830e91805243c19979cef5d435f..6d9875889cf005fc477aa08b954f96cdfd3423aa 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -22,10 +22,6 @@ bin_PROGRAMS = mdemo mdemo.debug
     $(srcdir)/../libltdl/ltdl.c $(srcdir)/../libltdl/ltdl.h
        (cd ../libltdl; $(MAKE) libltdlc.la)
 
-../libltdl/libtool:
-       test -d ../libltdl || mkdir ../libltdl
-       (cd ../libltdl && $(srcdir)/../libltdl/configure)
-
 # Create a version of mdemo that does dlopen.
 mdemo_SOURCES = main.c
 mdemo_LDADD = ../libltdl/libltdlc.la