This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[committed] Clean up libobjc configure, stage 3/n
- From: neroden at twcny dot rr dot com (Nathanael Nerode)
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 9 Apr 2004 07:22:18 -0400
- Subject: [committed] Clean up libobjc configure, stage 3/n
This doesn't change the logic. Bootstrapped i686-pc-linux-gnu, committing.
* configure.in: Clean up handling of
--enable-version-specific-runtime-libs and related variables;
replace 'if test' with 'case' where reasonable. Fix comments.
Remove useless libstdcxx_interface.
* configure: Regenerate.
--- configure.in 2004-04-09 06:53:20.000000000 -0400
+++ configure.in.new 2004-04-09 07:10:26.000000000 -0400
@@ -145,15 +145,6 @@
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
AC_PROG_INSTALL
-# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and
-# exported correctly.
-glibcpp_toolexecdir=no
-glibcpp_toolexeclibdir=no
-glibcpp_prefixdir=${prefix}
-
-AC_MSG_CHECKING([for interface version number])
-libstdcxx_interface=$INTERFACE
-AC_MSG_RESULT($libstdcxx_interface)
# Process the option "--enable-version-specific-runtime-libs"
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
@@ -164,7 +155,7 @@
no) version_specific_libs=no ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
esac],
-version_specific_libs=no)dnl
+[version_specific_libs=no])
# Option set, now we can test it.
AC_MSG_RESULT($version_specific_libs)
@@ -174,38 +165,37 @@
AC_SUBST(gcc_version)
AC_SUBST(gcc_version_trigger)
-if test $version_specific_libs = yes; then
- # Need the gcc compiler version to know where to install libraries
- # and header files if --enable-version-specific-runtime-libs option
- # is selected.
- changequote(,)dnl
- glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
- glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
- changequote([,])dnl
-fi
-
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
-# Install a library built with a cross compiler in tooldir, not libdir.
-if test x"$glibcpp_toolexecdir" = x"no"; then
- if test -n "$with_cross_host" &&
- test x"$with_cross_host" != x"no"; then
- glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
- glibcpp_toolexeclibdir='$(toolexecdir)/lib'
- else
- glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
- glibcpp_toolexeclibdir='$(libdir)'
- fi
- multi_os_directory=`$CC -print-multi-os-directory`
- case $multi_os_directory in
- .) ;; # Avoid trailing /.
- *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
- esac
-fi
-
-AC_SUBST(glibcpp_prefixdir)
+case ${version_specific_libs} in
+ yes)
+ # Need the gcc compiler version to know where to install libraries
+ # and header files if --enable-version-specific-runtime-libs option
+ # is selected.
+ glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
+ glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
+ ;;
+ no)
+ if test -n "$with_cross_host" &&
+ test x"$with_cross_host" != x"no"; then
+ glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
+ glibcpp_toolexeclibdir='$(toolexecdir)/lib'
+ else
+ # Install a library built with a cross compiler in tooldir, not libdir.
+ glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+ glibcpp_toolexeclibdir='$(libdir)'
+ fi
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+ *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
+ esac
+ ;;
+esac
AC_SUBST(glibcpp_toolexecdir)
AC_SUBST(glibcpp_toolexeclibdir)
+glibcpp_prefixdir=${prefix}
+AC_SUBST(glibcpp_prefixdir)
dnl Checks for programs.
--
Make sure your vote will count.
http://www.verifiedvoting.org/