From af0c82b380db58b0022e40fed286b92ff6935d8d Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 9 Apr 2004 12:49:16 +0000 Subject: [PATCH] Makefile.in: Remove (unused) gcc_version_trigger. * Makefile.in: Remove (unused) gcc_version_trigger. * configure.in: Remove (unused) glibcpp_builddir. Don't AC_SUBST gcc_version_trigger. * configure: Regenerate. From-SVN: r80552 --- libobjc/ChangeLog | 5 +++++ libobjc/Makefile.in | 1 - libobjc/config.h.in | 49 +++++++++++++++++++++++++++++++++++++++++++- libobjc/configure.in | 5 +---- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 18e634c34bd..ddf62d074ad 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,5 +1,10 @@ 2004-04-09 Nathanael Nerode + * Makefile.in: Remove (unused) gcc_version_trigger. + * configure.in: Remove (unused) glibcpp_builddir. Don't AC_SUBST + gcc_version_trigger. + * configure: Regenerate. + * configure.in: Switch to modern style for AC_INIT, AC_OUTPUT. Sort file into sections. Remove dnl where appropriate. Fix other style issues. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index d20fce3a714..7ec1057de0b 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -34,7 +34,6 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ target_noncanonical = @target_noncanonical@ gcc_version = @gcc_version@ -gcc_version_trigger = @gcc_version_trigger@ top_srcdir = @top_srcdir@ toplevel_srcdir = @toplevel_srcdir@ toolexecdir = @glibcpp_toolexecdir@ diff --git a/libobjc/config.h.in b/libobjc/config.h.in index 70427edaf6b..3a009632066 100644 --- a/libobjc/config.h.in +++ b/libobjc/config.h.in @@ -1,2 +1,49 @@ -/* Define this if you have the header file */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ #undef HAVE_SCHED_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS diff --git a/libobjc/configure.in b/libobjc/configure.in index a8613d8b4f0..d56f6b25de6 100644 --- a/libobjc/configure.in +++ b/libobjc/configure.in @@ -109,16 +109,14 @@ AC_CANONICAL_SYSTEM _GCC_TOPLEV_NONCANONICAL_TARGET AC_SUBST(target_noncanonical) -# Export build and source directories. +# Export source directory. # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. -glibcpp_builddir=`${PWDCMD-pwd}` case $srcdir in [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; esac -AC_SUBST(glibcpp_builddir) AC_SUBST(glibcpp_srcdir) # Process the option "--enable-version-specific-runtime-libs" @@ -126,7 +124,6 @@ gcc_version_trigger=${srcdir}/../gcc/version.c gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` AC_SUBST(gcc_version) -AC_SUBST(gcc_version_trigger) # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir case ${version_specific_libs} in -- 2.30.2