This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[committed] Clean up libobjc configure, stage 4/n


	* configure.in: Move PACKAGE and VERSION settings up top.  Remove
	unused call to AC_PROG_LN_S.  Default RANLIB to ':'.  Remove
	redundant checks for values of RANLIB, AR, INSTALL.
	* configure: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/configure.in,v
retrieving revision 1.23
diff -u -r1.23 configure.in
--- configure.in	9 Apr 2004 11:43:02 -0000	1.23
+++ configure.in	9 Apr 2004 11:48:17 -0000
@@ -24,6 +24,12 @@
 AC_INIT(objc/objc.h)
 AC_CONFIG_HEADER(config.h)
 
+dnl We need the following definitions because AC_PROG_LIBTOOL relies on them
+PACKAGE=libobjc
+dnl Version is pulled out to make it a bit easier to change using sed.
+VERSION=1:0:0
+AC_SUBST(VERSION)
+
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
 # keeping the changes in LD private, export them just because LD is
@@ -77,11 +83,6 @@
 AC_SUBST(glibcpp_builddir)
 AC_SUBST(glibcpp_srcdir)
 
-# Will set LN_S to either 'ln -s' or 'ln'.  With autoconf 2.50+, can also
-# be 'cp -p' if linking isn't available.
-#ac_cv_prog_LN_S='cp -p'
-AC_PROG_LN_S
-
 # We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
 [  --with-target-subdir=SUBDIR
@@ -142,7 +143,7 @@
 
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_PROG_INSTALL
 
 
@@ -206,23 +207,7 @@
 
 AC_PROG_LIBTOOL
 
-dnl These should be inherited in the recursive make, but ensure they are
-dnl defined:
-test "$AR" || AR=ar
-AC_SUBST(AR)
-if test "$RANLIB"; then :
-  AC_SUBST(RANLIB)
-else
-  AC_PROG_RANLIB
-fi
-AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-
-dnl we need the following definitions because AC_PROG_LIBTOOL relies on them
-PACKAGE=libobjc
-dnl version is pulled out to make it a bit easier to change using sed.
-VERSION=1:0:0
-AC_SUBST(VERSION)
 
 dnl Checks for header files.
 # Sanity check for the cross-compilation case:

-- 
Make sure your vote will count.
http://www.verifiedvoting.org/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]