This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Modernize configure.ac's
- From: Simon Marchi <simon dot marchi at ericsson dot com>
- To: <gdb-patches at sourceware dot org>
- Cc: Simon Marchi <simon dot marchi at ericsson dot com>
- Date: Mon, 8 Feb 2016 14:31:19 -0500
- Subject: [PATCH] Modernize configure.ac's
- Authentication-results: sourceware.org; auth=none
Using AC_OUTPUT with arguments has been deprecated for some time in
autoconf, even in version 2.64, which we are using. This change should
not affect functionality.
I also removed the "exit 0"'s, they shouldn't be necessary.
gdb/ChangeLog:
* configure.ac: Use AC_CONFIG_FILES instead of passing arguments
to AC_OUTPUT.
* configure: Regenerate.
gdb/testsuite/ChangeLog:
* configure.ac: Use AC_CONFIG_FILES instead of passing arguments
to AC_OUTPUT.
* configure: Regenerate.
gdb/gdbserver/ChangeLog:
* configure.ac: Use AC_CONFIG_FILES instead of passing arguments
to AC_OUTPUT.
* configure: Regenerate.
---
gdb/configure | 25 +++++++++++++++++++------
gdb/configure.ac | 5 ++---
gdb/gdbserver/configure | 4 +---
gdb/gdbserver/configure.ac | 4 +++-
gdb/testsuite/configure | 2 +-
gdb/testsuite/configure.ac | 3 ++-
6 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/gdb/configure b/gdb/configure
index 26a00d8..b523deb 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -16565,10 +16565,8 @@ $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
ac_config_files="$ac_config_files gcore"
-
ac_config_files="$ac_config_files Makefile gdb-gdb.gdb doc/Makefile data-directory/Makefile"
-ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -17289,7 +17287,6 @@ do
"gdb-gdb.gdb") CONFIG_FILES="$CONFIG_FILES gdb-gdb.gdb" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
- "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -17907,7 +17904,25 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;;
"gcore":F) chmod +x gcore ;;
- "default":C)
+ "Makefile":F)
+case x$CONFIG_HEADERS in
+xconfig.h:config.in)
+echo > stamp-h ;;
+esac
+ ;;
+ "gdb-gdb.gdb":F)
+case x$CONFIG_HEADERS in
+xconfig.h:config.in)
+echo > stamp-h ;;
+esac
+ ;;
+ "doc/Makefile":F)
+case x$CONFIG_HEADERS in
+xconfig.h:config.in)
+echo > stamp-h ;;
+esac
+ ;;
+ "data-directory/Makefile":F)
case x$CONFIG_HEADERS in
xconfig.h:config.in)
echo > stamp-h ;;
@@ -18096,5 +18111,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
-exit 0
diff --git a/gdb/configure.ac b/gdb/configure.ac
index a7b7421..70452d3 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2333,8 +2333,7 @@ AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME])
GDB_AC_TRANSFORM([gcore], [GCORE_TRANSFORM_NAME])
AC_CONFIG_FILES([gcore], [chmod +x gcore])
-
-AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile data-directory/Makefile,
+AC_CONFIG_FILES([Makefile gdb-gdb.gdb doc/Makefile data-directory/Makefile],
[
case x$CONFIG_HEADERS in
xconfig.h:config.in)
@@ -2342,4 +2341,4 @@ echo > stamp-h ;;
esac
])
-exit 0
+AC_OUTPUT
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 4a6f26b..bb01922 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -7611,7 +7611,6 @@ fi
ac_config_files="$ac_config_files Makefile"
-ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -8312,7 +8311,6 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
"depdir") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -8858,7 +8856,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;;
- "default":C) case x$CONFIG_HEADERS in
+ "Makefile":F) case x$CONFIG_HEADERS in
xconfig.h:config.in)
echo > stamp-h ;;
esac
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index f15ee1f..627c590 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -473,9 +473,11 @@ if test x"$STDINT_H" != x; then
fi
AC_SUBST(GNULIB_STDINT_H)
-AC_OUTPUT(Makefile,
+AC_CONFIG_FILES([Makefile],
[case x$CONFIG_HEADERS in
xconfig.h:config.in)
echo > stamp-h ;;
esac
])
+
+AC_OUTPUT
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index c600426..976dbe8 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -3511,9 +3511,9 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
ac_config_files="$ac_config_files lib/pdtrace"
-
ac_config_files="$ac_config_files Makefile"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac
index c372af5..91e5d22 100644
--- a/gdb/testsuite/configure.ac
+++ b/gdb/testsuite/configure.ac
@@ -102,5 +102,6 @@ GDB_AC_TRANSFORM(readelf, READELF_TRANSFORM_NAME)
GDB_AC_TRANSFORM(as, GAS_TRANSFORM_NAME)
GDB_AC_TRANSFORM(nm, NM_TRANSFORM_NAME)
AC_CONFIG_FILES([lib/pdtrace], [chmod +x lib/pdtrace])
+AC_CONFIG_FILES([Makefile])
-AC_OUTPUT([Makefile])
+AC_OUTPUT
--
2.5.1