diff options
-rw-r--r-- | gdb/acx_configure_dir.m4 | 10 | ||||
-rwxr-xr-x | gdb/configure | 12 | ||||
-rw-r--r-- | gdb/configure.ac | 9 | ||||
-rwxr-xr-x | gdb/gdbserver/configure | 18 | ||||
-rw-r--r-- | gdb/gdbserver/configure.ac | 9 |
5 files changed, 55 insertions, 3 deletions
diff --git a/gdb/acx_configure_dir.m4 b/gdb/acx_configure_dir.m4 index 5a76eba..f5ae3a2 100644 --- a/gdb/acx_configure_dir.m4 +++ b/gdb/acx_configure_dir.m4 @@ -4,7 +4,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# ACX_CONFIGURE_DIR(SRC-DIR-NAME, BUILD-DIR-NAME) +# ACX_CONFIGURE_DIR(SRC-DIR-NAME, BUILD-DIR-NAME, EXTRA-ARGS) # --------------------------- # # Configure a subdirectory. This is an alternative to @@ -16,11 +16,14 @@ # Inputs: # - SRC-DIR-NAME is the source directory, relative to $srcdir. # - BUILD-DIR-NAME is `top-build -> build' +# - EXTRA-ARGS is an optional list of extra arguments to add +# at the end of the configure command. AC_DEFUN([ACX_CONFIGURE_DIR], [ in_src=$1 in_build=$2 + in_extra_args=$3 # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. @@ -105,6 +108,11 @@ AC_DEFUN([ACX_CONFIGURE_DIR], ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac + if test -n "$in_extra_args"; then + # Add the extra args at the end. + ac_sub_configure_args="$ac_sub_configure_args $in_extra_args" + fi + AC_MSG_NOTICE([running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) # The eval makes quoting arguments work. eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ diff --git a/gdb/configure b/gdb/configure index 5f52e91..8985230 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4835,6 +4835,12 @@ $as_echo "no" >&6; } fi +gnulib_extra_configure_args= +# If large-file support is disabled, make sure gnulib does the same. +if test "$enable_largefile" = no; then +gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile" +fi + # Configure gnulib. We need to build gnulib under some other # directory not "gnulib", to avoid the problem of both GDB and # GDBserver wanting to build it in the same directory, when building @@ -4842,6 +4848,7 @@ fi in_src="gnulib" in_build="build-gnulib" + in_extra_args="$gnulib_extra_configure_args" # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. @@ -4926,6 +4933,11 @@ fi ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac + if test -n "$in_extra_args"; then + # Add the extra args at the end. + ac_sub_configure_args="$ac_sub_configure_args $in_extra_args" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. diff --git a/gdb/configure.ac b/gdb/configure.ac index 84232f2..c933e3f 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -51,11 +51,18 @@ esac AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes) AC_PROG_MAKE_SET +gnulib_extra_configure_args= +# If large-file support is disabled, make sure gnulib does the same. +if test "$enable_largefile" = no; then +gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile" +fi + # Configure gnulib. We need to build gnulib under some other # directory not "gnulib", to avoid the problem of both GDB and # GDBserver wanting to build it in the same directory, when building # in the source dir. -ACX_CONFIGURE_DIR(["gnulib"], ["build-gnulib"]) +ACX_CONFIGURE_DIR(["gnulib"], ["build-gnulib"], + ["$gnulib_extra_configure_args"]) dnl List of object files and targets accumulated by configure. diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 45838f5..45efc51 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4514,6 +4514,12 @@ $as_echo "no" >&6; } fi +gnulib_extra_configure_args= +# If large-file support is disabled, make sure gnulib does the same. +if test "$enable_largefile" = no; then +gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile" +fi + # Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect # to find the the source subdir to be configured directly under # gdbserver/. We need to build gnulib under some other directory not @@ -4522,6 +4528,7 @@ fi in_src="../gnulib" in_build="build-gnulib-gdbserver" + in_extra_args="$gnulib_extra_configure_args" # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. @@ -4606,6 +4613,11 @@ fi ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac + if test -n "$in_extra_args"; then + # Add the extra args at the end. + ac_sub_configure_args="$ac_sub_configure_args $in_extra_args" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. @@ -4619,6 +4631,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach in_src="../../libiberty" in_build="build-libiberty-gdbserver" + in_extra_args= # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. @@ -4703,6 +4716,11 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac + if test -n "$in_extra_args"; then + # Add the extra args at the end. + ac_sub_configure_args="$ac_sub_configure_args $in_extra_args" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index f59e65b..c9bb15d 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -69,12 +69,19 @@ esac AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes) AC_PROG_MAKE_SET +gnulib_extra_configure_args= +# If large-file support is disabled, make sure gnulib does the same. +if test "$enable_largefile" = no; then +gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile" +fi + # Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect # to find the the source subdir to be configured directly under # gdbserver/. We need to build gnulib under some other directory not # "gnulib", to avoid the problem of both GDB and GDBserver wanting to # build it in the same directory, when building in the source dir. -ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"]) +ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"], + ["$gnulib_extra_configure_args"]) ACX_CONFIGURE_DIR(["../../libiberty"], ["build-libiberty-gdbserver"]) |