diff options
| -rw-r--r-- | libobjc/ChangeLog | 6 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 2 | ||||
| -rwxr-xr-x | libobjc/configure | 10 | ||||
| -rw-r--r-- | libobjc/configure.ac | 5 |
4 files changed, 21 insertions, 2 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 4dc49cc..f9412b0 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2004-04-14 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.ac: Restore toolexecdir. + * Makefile.in: Restore toolexecdir. + * configure: Regenerate. + 2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org> * configure.ac: Remove (unused) glibcpp_prefixdir. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 16e882c..f06fa13 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -36,6 +36,8 @@ target_noncanonical = @target_noncanonical@ gcc_version = @gcc_version@ top_srcdir = @top_srcdir@ toplevel_srcdir = @toplevel_srcdir@ +toolexecdir = @toolexecdir@ +# Toolexecdir is used only by toolexeclibdir toolexeclibdir = @toolexeclibdir@ top_builddir = . diff --git a/libobjc/configure b/libobjc/configure index b592011..b7105a7 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexeclibdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1553,19 +1553,23 @@ gcc_version=`echo ${gcc_version_full} | sed -e 's/\(^ *\) .*/\1/'` # Calculate toolexeclibdir +# Also toolexecdir, though it's only used in toolexeclibdir 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. + toolexecdir='$(libdir)/gcc/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' ;; no) if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/lib' else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' toolexeclibdir='$(libdir)' fi multi_os_directory=`$CC -print-multi-os-directory` @@ -1577,6 +1581,7 @@ case ${version_specific_libs} in esac + # -------- # Programs # -------- @@ -3605,7 +3610,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3608 "configure"' > conftest.$ac_ext + echo '#line 3613 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5597,6 +5602,7 @@ s,@target_os@,$target_os,;t t s,@target_noncanonical@,$target_noncanonical,;t t s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t s,@gcc_version@,$gcc_version,;t t +s,@toolexecdir@,$toolexecdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t diff --git a/libobjc/configure.ac b/libobjc/configure.ac index f58dafe..b0c86bd 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -125,19 +125,23 @@ gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` AC_SUBST(gcc_version) # Calculate toolexeclibdir +# Also toolexecdir, though it's only used in toolexeclibdir 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. + toolexecdir='$(libdir)/gcc/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' ;; no) if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' toolexeclibdir='$(toolexecdir)/lib' else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' toolexeclibdir='$(libdir)' fi multi_os_directory=`$CC -print-multi-os-directory` @@ -147,6 +151,7 @@ case ${version_specific_libs} in esac ;; esac +AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) # -------- |