* Makefile.in, configure.in: Use one variable, frags, to hold

pathnames of makefile fragments.
* configure: regenerated.

3 files changed, 39 insertions, 34 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9fdac93..3fe9982 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 14 16:16:56 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* Makefile.in, configure.in: Use one variable, frags, to hold
+	pathnames of makefile fragments.
+	* configure: regenerated.
+
 Fri Jul 14 09:49:47 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* procfs.c (procfs_ops): Fix typo in last change.
diff --git a/gdb/configure b/gdb/configure
index ca5ef18..34c20b0 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.3 
+# Generated automatically using autoconf version 2.4 
 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -222,7 +222,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.3"
+    echo "configure generated by autoconf version 2.4"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -527,13 +527,15 @@ fi
 rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
 fi
-CPP="$ac_cv_prog_CPP"
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 537 "configure"
+#line 539 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -560,7 +562,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 564 "configure"
+#line 566 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
@@ -622,6 +624,7 @@ fi
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  ac_dir=`cd $ac_dir; pwd`
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -722,6 +725,7 @@ fi
 
 ac_aux_dir=
 for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
+  ac_dir=`cd $ac_dir; pwd`
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -914,10 +918,12 @@ EOF
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `make acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
-    then
-      ac_im_usrlibdir=$ac_im_libdir
-    fi
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
     # Screen out bogus values from the imake configuration.
     case "$ac_im_incroot" in
 	/usr/include) ;;
@@ -937,7 +943,7 @@ test -z "$x_direct_test_library" && x_direct_test_library=Xt
 test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
 test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
 cat > conftest.$ac_ext <<EOF
-#line 941 "configure"
+#line 947 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
@@ -1000,7 +1006,7 @@ rm -f conftest*
 ac_save_LIBS="$LIBS"
 LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1004 "configure"
+#line 1010 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1118,7 +1124,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1122 "configure"
+#line 1128 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1161,7 +1167,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1165 "configure"
+#line 1171 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1195,7 +1201,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1199 "configure"
+#line 1205 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1234,7 +1240,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1238 "configure"
+#line 1244 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1272,7 +1278,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1276 "configure"
+#line 1282 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1329,7 +1335,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1333 "configure"
+#line 1339 "configure"
 #include "confdefs.h"
 #include <tk.h>
 EOF
@@ -1431,7 +1437,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1441 "configure"
 #include "confdefs.h"
 #include <tclInt.h>
 EOF
@@ -1857,19 +1863,18 @@ z8k-*-coff*)		gdb_target=z8k ;;
 esac
 
 
-
+frags=
 host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
 if test ! -f ${host_makefile_frag}; then
 { echo "configure: error: "*** Gdb does not support host ${host}"" 1>&2; exit 1; }
 fi
+frags="$frags $host_makefile_frag"
 
 target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt
 if test ! -f ${target_makefile_frag}; then
 { echo "configure: error: "*** Gdb does not support target ${target}"" 1>&2; exit 1; }
 fi
-
-host_makefile_frag_path=$host_makefile_frag
-target_makefile_frag_path=$target_makefile_frag
+frags="$frags $target_makefile_frag"
 
 
 
@@ -2024,7 +2029,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.3"
+    echo "$CONFIG_STATUS generated by autoconf version 2.4"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -2083,12 +2088,11 @@ s%@ENABLE_GDBTK@%$ENABLE_GDBTK%g
 s%@ENABLE_CFLAGS@%$ENABLE_CFLAGS%g
 s%@ENABLE_CLIBS@%$ENABLE_CLIBS%g
 s%@ENABLE_OBS@%$ENABLE_OBS%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-s%@target_makefile_frag_path@%$target_makefile_frag_path%g
 /@host_makefile_frag@/r $host_makefile_frag
 s%@host_makefile_frag@%%g
 /@target_makefile_frag@/r $target_makefile_frag
 s%@target_makefile_frag@%%g
+s%@frags@%$frags%g
 s%@subdirs@%$subdirs%g
 
 CEOF
diff --git a/gdb/configure.in b/gdb/configure.in
index 5a0b19b..852c258 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -411,27 +411,22 @@ esac
 dnl
 changequote([,])dnl
 
-
+frags=
 host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
 if test ! -f ${host_makefile_frag}; then
 AC_MSG_ERROR("*** Gdb does not support host ${host}")
 fi
+frags="$frags $host_makefile_frag"
 
 target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt
 if test ! -f ${target_makefile_frag}; then
 AC_MSG_ERROR("*** Gdb does not support target ${target}")
 fi
+frags="$frags $target_makefile_frag"
 
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-target_makefile_frag_path=$target_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST(target_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 AC_SUBST_FILE(target_makefile_frag)
+AC_SUBST(frags)
 
 changequote(,)dnl
 hostfile=`sed -n '