This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[libiberty] Fold config.table back into configure.ac
- From: Kelley Cook <kcook34 at ford dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 06 Jul 2005 16:03:32 -0400
- Subject: [libiberty] Fold config.table back into configure.ac
- Hop-count: 1
- Reply-to: kcook at gcc dot gnu dot org
Libiberty's Changelog says that config.table was split out from
configure.in way back in 1993 in order to reduce the maintenance burden
between libiberty and xiberty directories. The latter directory was
removed in 1998, so it won't hurt to fold config.table back into
configure.ac.
Bootstrapped i686-pc-cygwin. Created a newlib, multlibbed,
crosscompiler i686-pc-gnu-linux -> powerpc-unknown-elf
OK to install?
2005-07-06 Kelley Cook <kcook@gcc.gnu.org>
* config.table: Delete file. Move former contents into ...
* configure.ac: ... here and escape any brackets for m4.
* Makefile.in (config.status): Remove dependency on config.table.
* configure: Regenerate.
diff -prdu -x '*~' -x autom4te.cache /home/kcook34/gcc-orig/libiberty/Makefile.in ./Makefile.in
--- /home/kcook34/gcc-orig/libiberty/Makefile.in 2005-06-20 20:24:57.000000000 -0400
+++ ./Makefile.in 2005-07-06 11:11:51.458262600 -0400
@@ -401,7 +401,7 @@ config.h: stamp-h ; @true
stamp-h: $(srcdir)/config.in config.status Makefile
CONFIG_FILES= CONFIG_HEADERS=config.h:$(srcdir)/config.in $(SHELL) ./config.status
-config.status: $(srcdir)/configure $(srcdir)/config.table
+config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
# Depending on config.h makes sure that config.status has been re-run
diff -prdu -x '*~' -x autom4te.cache /home/kcook34/gcc-orig/libiberty/configure.ac ./configure.ac
--- /home/kcook34/gcc-orig/libiberty/configure.ac 2005-06-20 20:24:58.000000000 -0400
+++ ./configure.ac 2005-07-06 15:30:02.835118800 -0400
@@ -152,7 +152,75 @@ dnl When we start using automake:
dnl AM_PROG_INSTALL
AC_PROG_INSTALL
-. ${srcdir}/config.table
+# Don't build the shared library for build.
+if [[ -n "${with_build_subdir}" ]]; then
+ enable_shared=no
+fi
+
+frag=
+case "${host}" in
+ rs6000-ibm-aix3.1 | rs6000-ibm-aix)
+ frag=mh-aix ;;
+ *-*-cxux7*) frag=mh-cxux7 ;;
+ *-*-freebsd2.1.*) frag=mh-fbsd21 ;;
+ *-*-freebsd2.2.[[012]]) frag=mh-fbsd21 ;;
+ i370-*-opened*) frag=mh-openedition ;;
+ i[[34567]]86-*-windows*) frag=mh-windows ;;
+esac
+
+if [[ -n "${frag}" ]]; then
+ frags=${libiberty_topdir}/libiberty/config/$frag
+else
+ frags=
+fi
+
+# If they didn't specify --enable-shared, don't generate shared libs.
+case "${enable_shared}" in
+ yes) shared=yes ;;
+ no) shared=no ;;
+ "") shared=no ;;
+ *) shared=yes ;;
+esac
+if [[ "${shared}" = "yes" ]]; then
+ frag=
+ case "${host}" in
+ *-*-cygwin*) ;;
+ alpha*-*-linux*) frag=mh-elfalphapic ;;
+ arm*-*-*) frag=mh-armpic ;;
+ hppa*-*-*) frag=mh-papic ;;
+ i[[34567]]86-*-* | x86_64-*-*)
+ frag=mh-x86pic ;;
+ powerpc*-*-aix*) ;;
+ powerpc*-*-*) frag=mh-ppcpic ;;
+ sparc*-*-*) frag=mh-sparcpic ;;
+ s390*-*-*) frag=mh-s390pic ;;
+ *) frag=mh-${host_cpu}pic ;;
+ esac
+ if [[ -n "${frag}" ]]; then
+ frags="${frags} ${libiberty_topdir}/config/${frag}"
+ fi
+fi
+
+echo "# Warning: this fragment is automatically generated" > temp-frag
+
+for frag in ${frags}; do
+ if [[ -f ${frag} ]]; then
+ echo "Appending ${frag} to xhost-mkfrag"
+ echo "# Following fragment copied from ${frag}" >> temp-frag
+ cat ${frag} >> temp-frag
+ fi
+done
+
+# record if we want to build shared libs.
+if [[ "${shared}" = "yes" ]]; then
+ echo enable_shared = yes >> temp-frag
+else
+ echo enable_shared = no >> temp-frag
+fi
+
+frag=xhost-mkfrag
+${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
+
host_makefile_frag=${frag}
AC_SUBST_FILE(host_makefile_frag)