Commit 1fcfac98 by Nathanael Nerode

configure.in: Move PACKAGE and VERSION settings up top.

	* 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.

From-SVN: r80547
parent 9c01f395
2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org> 2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org>
* 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.
* configure.in: Clean up handling of * configure.in: Clean up handling of
--enable-version-specific-runtime-libs and related variables; --enable-version-specific-runtime-libs and related variables;
replace 'if test' with 'case' where reasonable. Fix comments. replace 'if test' with 'case' where reasonable. Fix comments.
......
...@@ -24,6 +24,12 @@ AC_PREREQ(2.13) ...@@ -24,6 +24,12 @@ AC_PREREQ(2.13)
AC_INIT(objc/objc.h) AC_INIT(objc/objc.h)
AC_CONFIG_HEADER(config.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 # This works around the fact that libtool configuration may change LD
# for this particular configuration, but some shells, instead of # for this particular configuration, but some shells, instead of
# keeping the changes in LD private, export them just because LD is # keeping the changes in LD private, export them just because LD is
...@@ -77,11 +83,6 @@ esac ...@@ -77,11 +83,6 @@ esac
AC_SUBST(glibcpp_builddir) AC_SUBST(glibcpp_builddir)
AC_SUBST(glibcpp_srcdir) 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. # We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR [ --with-target-subdir=SUBDIR
...@@ -142,7 +143,7 @@ LIB_AC_PROG_CC ...@@ -142,7 +143,7 @@ LIB_AC_PROG_CC
AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error) AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_PROG_INSTALL AC_PROG_INSTALL
...@@ -206,24 +207,8 @@ AC_LIBTOOL_WIN32_DLL ...@@ -206,24 +207,8 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL 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 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. dnl Checks for header files.
# Sanity check for the cross-compilation case: # Sanity check for the cross-compilation case:
AC_CHECK_HEADER(stdio.h,:, AC_CHECK_HEADER(stdio.h,:,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment