From: Thomas Tanner Date: Sun, 20 Dec 1998 10:26:52 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: automake_1-4~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45279c6d70d05e84253fd3ef542283d839d45b37;p=thirdparty%2Flibtool.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 6fa1dd026..3cff6ec0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-12-20 Thomas Tanner + + * autogen: configure demo, depdemo, libltdl and mdemo + * tests/mdemo-exec.test: renamed hell* to mdemo* + * tests/mdemo-inst.test: ditto + 1998-12-19 Thomas Tanner * libltdl/Makefile.am: build a normal libtool library diff --git a/autogen b/autogen index 68a4001d7..5f1185c9a 100644 --- a/autogen +++ b/autogen @@ -4,9 +4,20 @@ # requires GNU autoconf and GNU automake # this is not meant to go into the distributions -rm -f acinclude.m4 && -ln -s libtool.m4 acinclude.m4 && -aclocal && -automake --gnits --add-missing && -autoconf && +rm -f acinclude.m4 +ln -s libtool.m4 acinclude.m4 +aclocal +automake --gnits --add-missing +autoconf + +for sub in demo depdemo libltdl mdemo; do + cd $sub + rm -f acinclude.m4 + ln -s ../libtool.m4 acinclude.m4 + aclocal + automake --gnits --add-missing + autoconf + cd .. +done + exit 0 diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test index 530b60509..1d6faca01 100755 --- a/tests/mdemo-exec.test +++ b/tests/mdemo-exec.test @@ -10,7 +10,7 @@ if test -z "$srcdir"; then fi . $srcdir/defs || exit 1 -if test -f ../mdemo/hell; then : +if test -f ../mdemo/mdemo; then : else echo "You must run mdemo-make.test before running $0" 1>&2 exit 1 @@ -20,15 +20,15 @@ fi echo "Executing uninstalled programs in ../mdemo" status=0 -if ../mdemo/hell.debug ../mdemo/libfoo1.la ../mdemo/libfoo2.la; then : +if ../mdemo/mdemo.debug ../mdemo/libfoo1.la ../mdemo/libfoo2.la; then : else - echo "$0: cannot execute ../mdemo/hell.debug" 1>&2 + echo "$0: cannot execute ../mdemo/mdemo.debug" 1>&2 status=1 fi -if ../mdemo/hell ../mdemo/libfoo1.la ../mdemo/libfoo2.la; then : +if ../mdemo/mdemo ../mdemo/libfoo1.la ../mdemo/libfoo2.la; then : else - echo "$0: cannot execute ../mdemo/hell" 1>&2 + echo "$0: cannot execute ../mdemo/mdemo" 1>&2 status=1 fi diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test index e5d307614..4b12990e2 100755 --- a/tests/mdemo-inst.test +++ b/tests/mdemo-inst.test @@ -11,7 +11,7 @@ fi . $srcdir/defs || exit 1 # Check that things are built. -if test -f ../mdemo/hell; then : +if test -f ../mdemo/mdemo; then : else echo "You must run mdemo-make.test before $0" 1>&2 exit 1 @@ -33,15 +33,15 @@ $make install || exit 1 echo "= Executing installed programs" status=0 -if $prefix/bin/hell.debug $prefix/lib/libfoo1.la $prefix/lib/libfoo2.la; then : +if $prefix/bin/mdemo.debug $prefix/lib/libfoo1.la $prefix/lib/libfoo2.la; then : else - echo "$0: cannot execute $prefix/bin/hell.debug" 1>&2 + echo "$0: cannot execute $prefix/bin/mdemo.debug" 1>&2 status=1 fi -if $prefix/bin/hell $prefix/lib/libfoo1.la $prefix/lib/libfoo2.la; then : +if $prefix/bin/mdemo $prefix/lib/libfoo1.la $prefix/lib/libfoo2.la; then : else - echo "$0: cannot execute $prefix/bin/hell" 1>&2 + echo "$0: cannot execute $prefix/bin/mdemo" 1>&2 # Simple check to see if they are superuser. if test -w /; then :