diff options
Diffstat (limited to 'libjava/libltdl')
| -rw-r--r-- | libjava/libltdl/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/libltdl/missing | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index c2285c032c3..534814586c8 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,8 @@ +2015-07-24 Michael Darling <darlingm@gmail.com> + + PR other/66259 + * THREADS: Reflects renaming of configure.in to configure.ac + 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> * Makefile.in: Regenerated with automake-1.11.6. diff --git a/libjava/libltdl/missing b/libjava/libltdl/missing index 64b5f901dd5..0454cb0a8b7 100755 --- a/libjava/libltdl/missing +++ b/libjava/libltdl/missing @@ -36,11 +36,6 @@ run=: # In the cases where this matters, `missing' is being run in the # srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi msg="missing on your system" @@ -139,7 +134,7 @@ case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want + you modified \`acinclude.m4' or \`configure.ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -148,7 +143,7 @@ WARNING: \`$1' is $msg. You should only need it if autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the + you modified \`configure.ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -157,10 +152,10 @@ WARNING: \`$1' is $msg. You should only need it if autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want + you modified \`acconfig.h' or \`configure.ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.ac` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -176,7 +171,7 @@ WARNING: \`$1' is $msg. You should only need it if automake*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + you modified \`Makefile.am', \`acinclude.m4' or \`configure.ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | |