aboutsummaryrefslogtreecommitdiff
path: root/libjava/libltdl
diff options
context:
space:
mode:
authorJeff Law <law@gcc.gnu.org>2015-07-24 12:20:44 -0600
committerJeff Law <law@gcc.gnu.org>2015-07-24 12:20:44 -0600
commit6b1786aa65f71d94362d38ada4bf96b6841a59cb (patch)
tree96bb0ed7351cd7b40e9303e38db7d0fc7f3aa2cf /libjava/libltdl
parent525a825bc6fedc3a5d0c5311098ad55e830e8ac6 (diff)
downloadgcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.zip
gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.gz
gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.bz2
re PR other/66259 (Combined gcc and binutils build from git-master fails, with gas/as-new not existing)
PR other/66259 * config-ml.in: Reflects renaming of configure.in to configure.ac * configure: Likewise * configure.ac: Likewise boehm-gc/ PR other/66259 * Makefile.direct: Reflects renaming of configure.in to configure.ac * Makefile.dist: Likewise * version.h: Likewise * doc/README: Likewise config/ PR other/66259 * gettext.m4: Reflects renaming of configure.in to configure.ac * po.m4: Likewise * stdint.m4: Likewise * tcl.m4: Likewise gcc/ PR other/66259 * acinclude.m4: Reflects renaming of configure.in to configure.ac * configure: Likewise * configure.ac: Likewise * doc/install.texi: Likewise * doc/tm.texi: Likewise * doc/tm.texi.in: Likewise gcc/ada/ PR other/66259 * prj-nmsc.adb: Reflects renaming of configure.in to configure.ac * gcc-interface/Makefile.in: Likewise intl/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac libjava/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac libjava/classpath PR other/66259 * INSTALL: Reflects renaming of configure.in to configure.ac * ltconfig: Likewise * missing: Likewise * m4/ac_prog_javac.m4: Likewise * m4/ac_prog/javac_works.m4: Likewise * resource/META-INF/mimetypes.default: Likewise libjava/libltdl PR other/66259 * THREADS: Reflects renaming of configure.in to configure.ac liboffloadmic/ PR other/66259 * configure: Reflects renaming of configure.in to configure.ac From-SVN: r226183
Diffstat (limited to 'libjava/libltdl')
-rw-r--r--libjava/libltdl/ChangeLog5
-rwxr-xr-xlibjava/libltdl/missing15
2 files changed, 10 insertions, 10 deletions
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog
index c2285c0..5348145 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 64b5f90..0454cb0 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 |