From: Gary V. Vaughan Date: Thu, 25 Sep 2003 11:22:29 +0000 (+0000) Subject: * bootstrap: Rewritten to use autoreconf. X-Git-Tag: release-1-9b~321 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a9392fb115d97da5649db44f3b68ea79e6c1f6;p=thirdparty%2Flibtool.git * bootstrap: Rewritten to use autoreconf. * config.guess, config.sub, mkstamp: Moved from here... * config/config.guess, config/config.sub, config/mkstamp: ...to here, respectively. * libtool.m4, ltdl.m4: Moved from here... * m4/libtool.m4, m4/ltdl.m4: ...to here, respectively. * configure.ac: Removed various acinclude.m4 hackery, as these files are no longer needed with automake 1.8. * Makefile.am: Removed various acinclude.m4 hackery, as these files are no longer needed with automake 1.8. (AUTOMAKE_OPTIONS): Require CVS automake. (CONF_SUBDIRS, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, FFLAGS, FLIBS): Automake now makes a Make variable from every AC_SUBST, so these are NOP. (aclocal_macros): These files are now in their own m4 subdir. Changed all clients. (EXTRA_DIST): mkstamp has moved to the new config subdir. Changed all clients. (pkgdata_SCRIPTS): Ditto wrt config.guess and config.sub. (pkgdata_DATA): Ditto wrt ltmain.sh. * f77demo/configure.ac, libltdl/configure.ac (AM_CONFIG_HEADER): Is deprecated in favour of AC_CONFIG_HEADERS. Updated to the latter. * Makefile.am, cdemo/Makefile.am, demo/Makefile.am, depdemo/Makefile.am, f77demo/Makefile.am, mdemo/Makefile.am, mdemo2/Makefile.am, pdemo/Makefile.am, tagdemo/Makefile.am (EXTRA_DIST): Remove acinclude.m4. (ACLOCAL_AMFLAGS): Search new `m4' macro directory. * configure.ac, cdemo/configure.ac, demo/configure.ac, depdemo/configure.ac, f77demo/configure.ac, mdemo/configure.ac, mdemo2/configure.ac, pdemo/configure.ac, tagdemo/configure.ac (AC_CONFIG_AUX_DIR): Declare that config helper scripts are now kept in the new config subdir. * libltdl/configure.ac (AC_CONFIG_AUX_DIR): Removed. Defaults to `.' anyway. --- diff --git a/ChangeLog b/ChangeLog index 05d303955..7f566776a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2003-09-24 Gary V. Vaughan + + * bootstrap: Rewritten to use autoreconf. + * config.guess, config.sub, mkstamp: Moved from here... + * config/config.guess, config/config.sub, config/mkstamp: ...to + here, respectively. + * libtool.m4, ltdl.m4: Moved from here... + * m4/libtool.m4, m4/ltdl.m4: ...to here, respectively. + * configure.ac: Removed various acinclude.m4 hackery, as these + files are no longer needed with automake 1.8. + * Makefile.am: Removed various acinclude.m4 hackery, as these + files are no longer needed with automake 1.8. + (AUTOMAKE_OPTIONS): Require CVS automake. + (CONF_SUBDIRS, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, FFLAGS, FLIBS): + Automake now makes a Make variable from every AC_SUBST, so these + are NOP. + (aclocal_macros): These files are now in their own m4 subdir. + Changed all clients. + (EXTRA_DIST): mkstamp has moved to the new config subdir. Changed + all clients. + (pkgdata_SCRIPTS): Ditto wrt config.guess and config.sub. + (pkgdata_DATA): Ditto wrt ltmain.sh. + * f77demo/configure.ac, libltdl/configure.ac (AM_CONFIG_HEADER): + Is deprecated in favour of AC_CONFIG_HEADERS. Updated to the + latter. + * Makefile.am, cdemo/Makefile.am, demo/Makefile.am, + depdemo/Makefile.am, f77demo/Makefile.am, mdemo/Makefile.am, + mdemo2/Makefile.am, pdemo/Makefile.am, tagdemo/Makefile.am + (EXTRA_DIST): Remove acinclude.m4. + (ACLOCAL_AMFLAGS): Search new `m4' macro directory. + * configure.ac, cdemo/configure.ac, demo/configure.ac, + depdemo/configure.ac, f77demo/configure.ac, mdemo/configure.ac, + mdemo2/configure.ac, pdemo/configure.ac, tagdemo/configure.ac + (AC_CONFIG_AUX_DIR): Declare that config helper scripts are now + kept in the new config subdir. + * libltdl/configure.ac (AC_CONFIG_AUX_DIR): Removed. Defaults to + `.' anyway. + 2003-09-21 Robert Millan * libtool.m4: Add GNU/KNetBSD support. @@ -8,7 +46,7 @@ * libtool.m4: allow STRIP to contain spaces and additional arguments. (Debian Bug #183055) * ltmain.in: include newline in "sensible default" for IFS. - (Debian Bug #98492 and #95447) + (Debian Bug #98492 and #95447) 2003-09-11 Peter O'Gorman diff --git a/Makefile.am b/Makefile.am index e4228012c..9b1c7db66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,29 +1,21 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = 1.3e gnu +AUTOMAKE_OPTIONS = 1.7a gnu +ACLOCAL_AMFLAGS = -I m4 BUILD_SUBDIRS = . libltdl doc tests -CONF_SUBDIRS = @CONF_SUBDIRS@ SUBDIRS = $(BUILD_SUBDIRS) DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS) -# We need to export these variables -CFLAGS = @CFLAGS@ -CPPLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS= @LIBS@ -FFLAGS = @FFLAGS@ -FLIBS = @FLIBS@ - -aclocal_macros = libtool.m4 ltdl.m4 +aclocal_macros = m4/libtool.m4 m4/ltdl.m4 EXTRA_DIST = $(aclocal_macros) bootstrap libtoolize.in ltmain.in \ - mkstamp ChangeLog.0 ChangeLog.1 + config/mkstamp ChangeLog.0 ChangeLog.1 CLEANFILES = libtool libtoolize ltmain.shT # These are required by libtoolize. -pkgdata_SCRIPTS = config.guess config.sub -pkgdata_DATA = ltmain.sh +pkgdata_SCRIPTS = config/config.guess config/config.sub +pkgdata_DATA = config/ltmain.sh # This macro file should be visible to Automake's aclocal. aclocal_DATA = $(aclocal_macros) @@ -31,7 +23,7 @@ aclocal_DATA = $(aclocal_macros) # The standalone libtool script, and the libtool distributor. bin_SCRIPTS = libtool libtoolize -libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac +libtool: $(srcdir)/config/ltmain.sh $(top_builddir)/configure.ac $(SHELL) $(top_builddir)/config.status --recheck chmod +x $@ @@ -39,9 +31,9 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) $(top_builddir)/config.status chmod +x $@ -$(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS) +$(srcdir)/config/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS) -rm -f ltmain.shT - date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ + date=`$(SHELL) $(srcdir)/config/mkstamp < $(srcdir)/ChangeLog` && \ sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT mv -f ltmain.shT $@ || \ @@ -50,7 +42,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS) # TSDEPS will be defined to TSDEPS_DIST at `make dist' time TSDEPS = -TSDEPS_DIST = ChangeLog libtool.m4 +TSDEPS_DIST = ChangeLog config/libtool.m4 CVS = cvs # set it to `:' to avoid CVS operations .PHONY: timestamps update-timestamps @@ -60,19 +52,6 @@ update-timestamps: $(CVS) -n update $(TSDEPS_DIST) | grep '^M'); then \ echo "Cannot make dist before commit"; exit 1; else :; fi -# All our rules should depend on these demo files. -all-recursive: $(srcdir)/libltdl/acinclude.m4 $(ACINCLUDE_M4_LIST) - -@srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4 - -rm -f $@ $@T - cat $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4 > $@T - mv $@T $@ - -@ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4 - -rm -f $@ $@T - cat $(srcdir)/libtool.m4 > $@T - mv $@T $@ - .PHONY: configure-subdirs configure-subdirs distdir: $(DIST_MAKEFILE_LIST) @DIST_MAKEFILE_LIST@: diff --git a/bootstrap b/bootstrap index 303ae9cec..b50b52f2a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,14 +1,7 @@ #! /bin/sh # helps bootstrapping libtool, when checked out from CVS -# requires at least GNU autoconf 2.56 and GNU automake 1.7 - -rm -rf `find . \( -name autom4te.cache -o -name libtool \) -print` - -: ${ACLOCAL=aclocal} -: ${AUTOMAKE=automake} -: ${AUTOCONF=autoconf} -: ${AUTOHEADER=autoheader} +# requires at least GNU autoconf 2.58 and GNU automake 1.8 # Upgrade caveat @@ -21,44 +14,23 @@ WARNING: them with `libtool.m4' as shipped with this distribution. WARNING: After that, retry this bootstrap. EOF -# fake the libtool scripts -touch ltmain.sh -touch libtoolize -(cd libltdl && touch ltmain.sh) +rm -rf `find . \( -name autom4te.cache -o -name libtool \) -print` -for sub in . libltdl cdemo demo depdemo mdemo mdemo2 pdemo tagdemo f77demo; do - case $sub in - .) - top_srcdir=. - acfiles="$top_srcdir/libtool.m4" - AUTOMAKE_FLAGS="--gnu --add-missing --copy" - ;; - libltdl) - top_srcdir=.. - acfiles="$top_srcdir/libtool.m4 $top_srcdir/ltdl.m4" - AUTOMAKE_FLAGS="--gnits --add-missing --copy" - ;; - *) - top_srcdir=.. - acfiles="$top_srcdir/libtool.m4" - AUTOMAKE_FLAGS="--gnits --add-missing" - ;; - esac +fakes="config/ltmain.sh config/libtoolize libltdl/ltmain.sh libltdl/libtoolize" - cd $sub - rm -f acinclude.m4 aclocal.m4 Makefile configure - for file in $acfiles; do - cat $file >> ./acinclude.m4 - done +for file in $fakes; do + touch $file +done + +for sub in . *demo *demo[1-9]; do + autoreconf --force --verbose --install $sub +done - $ACLOCAL - test $sub = libltdl && $AUTOHEADER - test $sub = f77demo && $AUTOHEADER - eval $AUTOMAKE $AUTOMAKE_FLAGS - $AUTOCONF - cd $top_srcdir +for file in $fakes; do + rm -f $file done -rm -f ltmain.sh libtoolize libltdl/ltmain.sh +# These files con cause an infinite configure loop if left behind. +rm -f Makefile libltdl/Makefile libtool exit 0 diff --git a/cdemo/Makefile.am b/cdemo/Makefile.am index 62c930f87..78c9af2be 100644 --- a/cdemo/Makefile.am +++ b/cdemo/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign - -EXTRA_DIST = acinclude.m4 +ACLOCAL_AMFLAGS = -I ../m4 noinst_LTLIBRARIES = libfoo.la diff --git a/cdemo/configure.ac b/cdemo/configure.ac index 0340ed981..962b40d3c 100644 --- a/cdemo/configure.ac +++ b/cdemo/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.50) - ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/config.guess b/config/config.guess similarity index 99% rename from config.guess rename to config/config.guess index 0e30d56e9..d56c46d84 100755 --- a/config.guess +++ b/config/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-07-02' +timestamp='2003-08-18' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -734,7 +734,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -948,6 +948,9 @@ EOF LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 diff --git a/config.sub b/config/config.sub similarity index 99% rename from config.sub rename to config/config.sub index c8a01bed9..689009918 100755 --- a/config.sub +++ b/config/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-07-04' +timestamp='2003-08-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -228,13 +228,14 @@ case $basic_machine in | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -304,7 +305,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ + | ip2k-* | iq2000-* \ | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -1164,6 +1165,9 @@ case $os in -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; diff --git a/mkstamp b/config/mkstamp similarity index 100% rename from mkstamp rename to config/mkstamp diff --git a/configure.ac b/configure.ac index 5708fb9cd..e17ae0e90 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([libtool], [1.5a], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([ltmain.in]) - +AC_CONFIG_AUX_DIR([config]) ## ---------------------------------------- ## @@ -40,7 +40,7 @@ AC_CONFIG_SRCDIR([ltmain.in]) TIMESTAMP= case AC_PACKAGE_VERSION in [*[acegikmoqsuwy])] - TIMESTAMP=`${CONFIG_SHELL} ${srcdir}/mkstamp < ${srcdir}/ChangeLog` + TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp < ${srcdir}/ChangeLog` AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION$TIMESTAMP]) echo ;; @@ -77,13 +77,10 @@ AC_CONFIG_SUBDIRS([libltdl]) CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo mdemo2 tagdemo f77demo" AC_SUBST([CONF_SUBDIRS]) -ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4" DIST_MAKEFILE_LIST= for dir in $CONF_SUBDIRS; do - ACINCLUDE_M4_LIST="$ACINCLUDE_M4_LIST ${srcdir}/$dir/acinclude.m4" DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile " done -AC_SUBST([ACINCLUDE_M4_LIST]) AC_SUBST([DIST_MAKEFILE_LIST]) diff --git a/demo/Makefile.am b/demo/Makefile.am index 68ae80895..ed078a76e 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign - -EXTRA_DIST = acinclude.m4 +ACLOCAL_AMFLAGS = -I ../m4 # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libhello.la diff --git a/demo/configure.ac b/demo/configure.ac index 89c98a074..db47bdc37 100644 --- a/demo/configure.ac +++ b/demo/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([demo], [1.0], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([hello.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/depdemo/Makefile.am b/depdemo/Makefile.am index 2108b7faf..ebbef1371 100644 --- a/depdemo/Makefile.am +++ b/depdemo/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign +ACLOCAL_AMFLAGS = -I ../m4 SUBDIRS = l1 l2 l3 l4 diff --git a/depdemo/configure.ac b/depdemo/configure.ac index d39f8cc0f..fb0904a13 100644 --- a/depdemo/configure.ac +++ b/depdemo/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/f77demo/Makefile.am b/f77demo/Makefile.am index 702a35268..1b5830959 100644 --- a/f77demo/Makefile.am +++ b/f77demo/Makefile.am @@ -3,18 +3,17 @@ ## $Id$ AUTOMAKE_OPTIONS = no-dependencies foreign - -EXTRA_DIST = acinclude.m4 +ACLOCAL_AMFLAGS = -I ../m4 noinst_LTLIBRARIES = libfoo.la libmix.la libfoo_la_SOURCES = foof.f libfoo_la_LDFLAGS = -no-undefined -libmix_la_SOURCES = foof.f fooc.c +libmix_la_SOURCES = foof.f fooc.c libmix_la_LDFLAGS = -no-undefined -noinst_HEADERS = foo.h +noinst_HEADERS = foo.h bin_PROGRAMS = fprogram cprogram @@ -27,8 +26,3 @@ cprogram_LDADD = libmix.la $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck - - - - - diff --git a/f77demo/configure.ac b/f77demo/configure.ac index 411c7366c..ac428255b 100644 --- a/f77demo/configure.ac +++ b/f77demo/configure.ac @@ -22,13 +22,14 @@ AC_PREREQ(2.50) ## Autoconf initialisation. ## ## ------------------------ ## AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org]) -AC_CONFIG_SRCDIR([foof.f])dnl +AC_CONFIG_HEADERS([config.h:config-h.in]) +AC_CONFIG_SRCDIR([foof.f]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## ## Automake Initialisation. ## ## ------------------------ ## AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER([config.h:config-h.in]) ## ------------------ ## @@ -42,7 +43,7 @@ AC_PROG_CC AC_PROG_F77 dnl Check the flags needed to link f77 programs with ld (i.e. cc) AC_F77_LIBRARY_LDFLAGS -dnl Check for underscoring of external names +dnl Check for underscoring of external names AC_F77_WRAPPERS # As of the writing of this demo, GNU Autoconf's AC_OBJEXT and diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index aa2a2728b..329958aec 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign +ACLOCAL_AMFLAGS = -I ../m4 if INSTALL_LTDL include_HEADERS = ltdl.h diff --git a/libltdl/configure.ac b/libltdl/configure.ac index 66ad0e5f2..b75f9ca5d 100644 --- a/libltdl/configure.ac +++ b/libltdl/configure.ac @@ -24,7 +24,8 @@ AC_PREREQ(2.50) ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libltdl], [1.2], [bug-libtool@gnu.org]) +AC_INIT([libltdl], [1.3], [bug-libtool@gnu.org]) +AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([ltdl.c]) @@ -32,8 +33,6 @@ AC_CONFIG_SRCDIR([ltdl.c]) ## Libltdl specific configuration. ## ## ------------------------------- ## -AC_CONFIG_AUX_DIR([.]) - if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then if test -f ${srcdir}/ltmain.sh; then # if libltdl is libtoolized, it is assumed to be stand-alone and @@ -51,7 +50,6 @@ fi ## Automake Initialisation. ## ## ------------------------ ## AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -) -AM_CONFIG_HEADER([config.h:config-h.in]) ## ------------------ ## diff --git a/libtool.m4 b/m4/libtool.m4 similarity index 100% rename from libtool.m4 rename to m4/libtool.m4 diff --git a/ltdl.m4 b/m4/ltdl.m4 similarity index 100% rename from ltdl.m4 rename to m4/ltdl.m4 diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am index 8136c4351..9a9a30d27 100644 --- a/mdemo/Makefile.am +++ b/mdemo/Makefile.am @@ -1,11 +1,10 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign +ACLOCAL_AMFLAGS = -I ../m4 INCLUDES = $(INCLTDL) -EXTRA_DIST = acinclude.m4 - lib_LTLIBRARIES = libsub.la foo1.la libfoo2.la libmlib.la foo1_la_SOURCES = foo1.c diff --git a/mdemo/configure.ac b/mdemo/configure.ac index e7f9121b2..3d8f2644c 100644 --- a/mdemo/configure.ac +++ b/mdemo/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/mdemo2/Makefile.am b/mdemo2/Makefile.am index 92be306dc..b0cd3b1e7 100644 --- a/mdemo2/Makefile.am +++ b/mdemo2/Makefile.am @@ -1,11 +1,10 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign +ACLOCAL_AMFLAGS = -I ../m4 INCLUDES = -I../libltdl -EXTRA_DIST = acinclude.m4 - bin_PROGRAMS = mdemo2 mdemo2_static # Create a version of mdemo2 that links a library that does dlopen. diff --git a/mdemo2/configure.ac b/mdemo2/configure.ac index 8efaf9b0c..c364f3545 100644 --- a/mdemo2/configure.ac +++ b/mdemo2/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([mdemo2], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([main.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/pdemo/Makefile.am b/pdemo/Makefile.am index 43e25303f..8158f8e7f 100644 --- a/pdemo/Makefile.am +++ b/pdemo/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS = no-dependencies foreign - -EXTRA_DIST = acinclude.m4 +ACLOCAL_AMFLAGS = -I ../m4 # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libhello.la diff --git a/pdemo/configure.ac b/pdemo/configure.ac index 89bfbe9ad..aa7c65602 100644 --- a/pdemo/configure.ac +++ b/pdemo/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([longer_file_name_hello.c]) +AC_CONFIG_AUX_DIR([../config]) ## ------------------------ ## diff --git a/tagdemo/Makefile.am b/tagdemo/Makefile.am index db5ae4aa5..72674acf4 100644 --- a/tagdemo/Makefile.am +++ b/tagdemo/Makefile.am @@ -3,8 +3,7 @@ ## $Id$ AUTOMAKE_OPTIONS = no-dependencies foreign - -EXTRA_DIST = acinclude.m4 +ACLOCAL_AMFLAGS = -I ../m4 noinst_LTLIBRARIES = libfoo.la lib_LTLIBRARIES = libbaz.la diff --git a/tagdemo/configure.ac b/tagdemo/configure.ac index c4f50d739..2de4923ab 100644 --- a/tagdemo/configure.ac +++ b/tagdemo/configure.ac @@ -24,6 +24,7 @@ AC_PREREQ(2.50) ## ------------------------ ## AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org]) AC_CONFIG_SRCDIR([foo.cpp]) +AC_CONFIG_AUX_DIR([../config]) AC_CANONICAL_TARGET