mirror of git://gcc.gnu.org/git/gcc.git
Makefile.in: Remove toolexecdir, glibcpp_toolexecdir (unused).
* Makefile.in: Remove toolexecdir, glibcpp_toolexecdir (unused). Replace glibcpp_toolexeclibdir with toolexeclibdir. * configure.in: Remove glibcpp_toolexecdir (unused). Replace glibcpp_toolexeclibdir with toolexeclibdir. Don't generate config.h or stamp-h (unused). Move one comment to the right place. * configure: Regenerate. * config.h.in: Remove (unused). From-SVN: r80554
This commit is contained in:
Nathanael Nerode
parent
88b169605a
commit
608e1e0cf7
|
|
@ -1,5 +1,13 @@
|
||||||
2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org>
|
2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||||
|
|
||||||
|
* Makefile.in: Remove toolexecdir, glibcpp_toolexecdir (unused).
|
||||||
|
Replace glibcpp_toolexeclibdir with toolexeclibdir.
|
||||||
|
* configure.in: Remove glibcpp_toolexecdir (unused).
|
||||||
|
Replace glibcpp_toolexeclibdir with toolexeclibdir. Don't generate
|
||||||
|
config.h or stamp-h (unused). Move one comment to the right place.
|
||||||
|
* configure: Regenerate.
|
||||||
|
* config.h.in: Remove (unused).
|
||||||
|
|
||||||
* config.h.in: Regenerate with autoheader.
|
* config.h.in: Regenerate with autoheader.
|
||||||
|
|
||||||
* Makefile.in: Remove (unused) gcc_version_trigger.
|
* Makefile.in: Remove (unused) gcc_version_trigger.
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,7 @@ target_noncanonical = @target_noncanonical@
|
||||||
gcc_version = @gcc_version@
|
gcc_version = @gcc_version@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
toplevel_srcdir = @toplevel_srcdir@
|
toplevel_srcdir = @toplevel_srcdir@
|
||||||
toolexecdir = @glibcpp_toolexecdir@
|
toolexeclibdir = @toolexeclibdir@
|
||||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
|
||||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
|
||||||
|
|
||||||
top_builddir = .
|
top_builddir = .
|
||||||
|
|
||||||
|
|
@ -255,12 +253,12 @@ doc: info dvi html
|
||||||
|
|
||||||
libobjc.la: $(OBJS)
|
libobjc.la: $(OBJS)
|
||||||
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
|
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
|
||||||
-rpath $(glibcpp_toolexeclibdir) \
|
-rpath $(toolexeclibdir) \
|
||||||
-version-info $(LIBOBJC_VERSION)
|
-version-info $(LIBOBJC_VERSION)
|
||||||
|
|
||||||
libobjc_gc.la: $(OBJS_GC)
|
libobjc_gc.la: $(OBJS_GC)
|
||||||
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
|
$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
|
||||||
-rpath $(glibcpp_toolexeclibdir) \
|
-rpath $(toolexeclibdir) \
|
||||||
-version-info $(LIBOBJC_GC_VERSION)
|
-version-info $(LIBOBJC_GC_VERSION)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -311,14 +309,14 @@ ${srcdir}/configure: configure.in
|
||||||
install: install-libs install-headers
|
install: install-libs install-headers
|
||||||
|
|
||||||
install-libs: installdirs
|
install-libs: installdirs
|
||||||
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir)
|
$(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir)
|
||||||
$(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(glibcpp_toolexeclibdir);
|
$(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(toolexeclibdir);
|
||||||
if [ "$(OBJC_BOEHM_GC)" ]; then \
|
if [ "$(OBJC_BOEHM_GC)" ]; then \
|
||||||
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \
|
$(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \
|
||||||
$(DESTDIR)$(glibcpp_toolexeclibdir);\
|
$(DESTDIR)$(toolexeclibdir);\
|
||||||
fi
|
fi
|
||||||
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
|
$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
|
||||||
@-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir)
|
@-$(LIBTOOL) --mode=finish $(DESTDIR)$(toolexeclibdir)
|
||||||
|
|
||||||
# Copy Objective C headers to installation include directory.
|
# Copy Objective C headers to installation include directory.
|
||||||
install-headers:
|
install-headers:
|
||||||
|
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
/* config.h.in. Generated from configure.in by autoheader. */
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
|
||||||
#undef HAVE_INTTYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <memory.h> header file. */
|
|
||||||
#undef HAVE_MEMORY_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sched.h> header file. */
|
|
||||||
#undef HAVE_SCHED_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdint.h> header file. */
|
|
||||||
#undef HAVE_STDINT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
|
||||||
#undef HAVE_STDLIB_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <strings.h> header file. */
|
|
||||||
#undef HAVE_STRINGS_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <string.h> header file. */
|
|
||||||
#undef HAVE_STRING_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
||||||
#undef HAVE_SYS_STAT_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
|
||||||
#undef HAVE_SYS_TYPES_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> 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
|
|
||||||
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif"
|
#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_builddir glibcpp_srcdir gcc_version gcc_version_trigger glibcpp_toolexecdir glibcpp_toolexeclibdir glibcpp_prefixdir 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 toolexeclibdir glibcpp_prefixdir 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=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
|
|
@ -1311,8 +1311,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_headers="$ac_config_headers config.h"
|
|
||||||
|
|
||||||
|
|
||||||
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
||||||
PACKAGE=libobjc
|
PACKAGE=libobjc
|
||||||
|
|
@ -1538,54 +1536,47 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Export build and source directories.
|
# Export source directory.
|
||||||
# These need to be absolute paths, yet at the same time need to
|
# These need to be absolute paths, yet at the same time need to
|
||||||
# canonicalize only relative paths, because then amd will not unmount
|
# 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.
|
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
|
||||||
glibcpp_builddir=`${PWDCMD-pwd}`
|
|
||||||
case $srcdir in
|
case $srcdir in
|
||||||
\\/$* | ?:\\/*) glibcpp_srcdir=${srcdir} ;;
|
\\/$* | ?:\\/*) glibcpp_srcdir=${srcdir} ;;
|
||||||
*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
|
*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Process the option "--enable-version-specific-runtime-libs"
|
# Process the option "--enable-version-specific-runtime-libs"
|
||||||
gcc_version_trigger=${srcdir}/../gcc/version.c
|
gcc_version_trigger=${srcdir}/../gcc/version.c
|
||||||
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
|
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
|
||||||
gcc_version=`echo ${gcc_version_full} | sed -e 's/\(^ *\) .*/\1/'`
|
gcc_version=`echo ${gcc_version_full} | sed -e 's/\(^ *\) .*/\1/'`
|
||||||
|
|
||||||
|
|
||||||
|
# Calculate toolexeclibdir
|
||||||
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
|
|
||||||
case ${version_specific_libs} in
|
case ${version_specific_libs} in
|
||||||
yes)
|
yes)
|
||||||
# Need the gcc compiler version to know where to install libraries
|
# Need the gcc compiler version to know where to install libraries
|
||||||
# and header files if --enable-version-specific-runtime-libs option
|
# and header files if --enable-version-specific-runtime-libs option
|
||||||
# is selected.
|
# is selected.
|
||||||
glibcpp_toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
|
toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
||||||
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
|
||||||
;;
|
;;
|
||||||
no)
|
no)
|
||||||
if test -n "$with_cross_host" &&
|
if test -n "$with_cross_host" &&
|
||||||
test x"$with_cross_host" != x"no"; then
|
test x"$with_cross_host" != x"no"; then
|
||||||
glibcpp_toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
|
||||||
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
|
|
||||||
else
|
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||||
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
toolexeclibdir='$(toolexecdir)/lib'
|
||||||
glibcpp_toolexeclibdir='$(libdir)'
|
else
|
||||||
|
toolexeclibdir='$(libdir)'
|
||||||
fi
|
fi
|
||||||
multi_os_directory=`$CC -print-multi-os-directory`
|
multi_os_directory=`$CC -print-multi-os-directory`
|
||||||
case $multi_os_directory in
|
case $multi_os_directory in
|
||||||
.) ;; # Avoid trailing /.
|
.) ;; # Avoid trailing /.
|
||||||
*) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
|
*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
glibcpp_prefixdir=${prefix}
|
glibcpp_prefixdir=${prefix}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3617,7 +3608,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
||||||
case $host in
|
case $host in
|
||||||
*-*-irix6*)
|
*-*-irix6*)
|
||||||
# Find out which ABI we are using.
|
# Find out which ABI we are using.
|
||||||
echo '#line 3620 "configure"' > conftest.$ac_ext
|
echo '#line 3611 "configure"' > conftest.$ac_ext
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
(eval $ac_compile) 2>&5
|
(eval $ac_compile) 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
|
|
@ -5009,7 +5000,38 @@ s/^[^=]*=[ ]*$//;
|
||||||
}'
|
}'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DEFS=-DHAVE_CONFIG_H
|
# Transform confdefs.h into DEFS.
|
||||||
|
# Protect against shell expansion while executing Makefile rules.
|
||||||
|
# Protect against Makefile macro expansion.
|
||||||
|
#
|
||||||
|
# If the first sed substitution is executed (which looks for macros that
|
||||||
|
# take arguments), then we branch to the quote section. Otherwise,
|
||||||
|
# look for a macro that doesn't take arguments.
|
||||||
|
cat >confdef2opt.sed <<\_ACEOF
|
||||||
|
t clear
|
||||||
|
: clear
|
||||||
|
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
|
||||||
|
t quote
|
||||||
|
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
|
||||||
|
t quote
|
||||||
|
d
|
||||||
|
: quote
|
||||||
|
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
|
||||||
|
s,\[,\\&,g
|
||||||
|
s,\],\\&,g
|
||||||
|
s,\$,$$,g
|
||||||
|
p
|
||||||
|
_ACEOF
|
||||||
|
# We use echo to avoid assuming a particular line-breaking character.
|
||||||
|
# The extra dot is to prevent the shell from consuming trailing
|
||||||
|
# line-breaks from the sub-command output. A line-break within
|
||||||
|
# single-quotes doesn't work because, if this script is created in a
|
||||||
|
# platform that uses two characters for line-breaks (e.g., DOS), tr
|
||||||
|
# would break.
|
||||||
|
ac_LF_and_DOT=`echo; echo .`
|
||||||
|
DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
|
||||||
|
rm -f confdef2opt.sed
|
||||||
|
|
||||||
|
|
||||||
ac_libobjs=
|
ac_libobjs=
|
||||||
ac_ltlibobjs=
|
ac_ltlibobjs=
|
||||||
|
|
@ -5343,15 +5365,10 @@ Usage: $0 [OPTIONS] [FILE]...
|
||||||
--recheck update $as_me by reconfiguring in the same conditions
|
--recheck update $as_me by reconfiguring in the same conditions
|
||||||
--file=FILE[:TEMPLATE]
|
--file=FILE[:TEMPLATE]
|
||||||
instantiate the configuration file FILE
|
instantiate the configuration file FILE
|
||||||
--header=FILE[:TEMPLATE]
|
|
||||||
instantiate the configuration header FILE
|
|
||||||
|
|
||||||
Configuration files:
|
Configuration files:
|
||||||
$config_files
|
$config_files
|
||||||
|
|
||||||
Configuration headers:
|
|
||||||
$config_headers
|
|
||||||
|
|
||||||
Configuration commands:
|
Configuration commands:
|
||||||
$config_commands
|
$config_commands
|
||||||
|
|
||||||
|
|
@ -5481,7 +5498,6 @@ do
|
||||||
# Handling of arguments.
|
# Handling of arguments.
|
||||||
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||||
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
|
||||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||||
{ (exit 1); exit 1; }; };;
|
{ (exit 1); exit 1; }; };;
|
||||||
|
|
@ -5494,7 +5510,6 @@ done
|
||||||
# bizarre bug on SunOS 4.1.3.
|
# bizarre bug on SunOS 4.1.3.
|
||||||
if $ac_need_defaults; then
|
if $ac_need_defaults; then
|
||||||
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
|
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
|
||||||
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
|
|
||||||
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
|
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -5583,12 +5598,9 @@ s,@target_cpu@,$target_cpu,;t t
|
||||||
s,@target_vendor@,$target_vendor,;t t
|
s,@target_vendor@,$target_vendor,;t t
|
||||||
s,@target_os@,$target_os,;t t
|
s,@target_os@,$target_os,;t t
|
||||||
s,@target_noncanonical@,$target_noncanonical,;t t
|
s,@target_noncanonical@,$target_noncanonical,;t t
|
||||||
s,@glibcpp_builddir@,$glibcpp_builddir,;t t
|
|
||||||
s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
|
s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
|
||||||
s,@gcc_version@,$gcc_version,;t t
|
s,@gcc_version@,$gcc_version,;t t
|
||||||
s,@gcc_version_trigger@,$gcc_version_trigger,;t t
|
s,@toolexeclibdir@,$toolexeclibdir,;t t
|
||||||
s,@glibcpp_toolexecdir@,$glibcpp_toolexecdir,;t t
|
|
||||||
s,@glibcpp_toolexeclibdir@,$glibcpp_toolexeclibdir,;t t
|
|
||||||
s,@glibcpp_prefixdir@,$glibcpp_prefixdir,;t t
|
s,@glibcpp_prefixdir@,$glibcpp_prefixdir,;t t
|
||||||
s,@CC@,$CC,;t t
|
s,@CC@,$CC,;t t
|
||||||
s,@CFLAGS@,$CFLAGS,;t t
|
s,@CFLAGS@,$CFLAGS,;t t
|
||||||
|
|
@ -5857,229 +5869,6 @@ done
|
||||||
_ACEOF
|
_ACEOF
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
cat >>$CONFIG_STATUS <<\_ACEOF
|
||||||
|
|
||||||
#
|
|
||||||
# CONFIG_HEADER section.
|
|
||||||
#
|
|
||||||
|
|
||||||
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
|
|
||||||
# NAME is the cpp macro being defined and VALUE is the value it is being given.
|
|
||||||
#
|
|
||||||
# ac_d sets the value in "#define NAME VALUE" lines.
|
|
||||||
ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
|
|
||||||
ac_dB='[ ].*$,\1#\2'
|
|
||||||
ac_dC=' '
|
|
||||||
ac_dD=',;t'
|
|
||||||
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
|
|
||||||
ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
|
||||||
ac_uB='$,\1#\2define\3'
|
|
||||||
ac_uC=' '
|
|
||||||
ac_uD=',;t'
|
|
||||||
|
|
||||||
for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
|
||||||
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
||||||
case $ac_file in
|
|
||||||
- | *:- | *:-:* ) # input from stdin
|
|
||||||
cat >$tmp/stdin
|
|
||||||
ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
||||||
ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
||||||
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
|
||||||
ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
|
||||||
* ) ac_file_in=$ac_file.in ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
||||||
echo "$as_me: creating $ac_file" >&6;}
|
|
||||||
|
|
||||||
# First look for the input files in the build tree, otherwise in the
|
|
||||||
# src tree.
|
|
||||||
ac_file_inputs=`IFS=:
|
|
||||||
for f in $ac_file_in; do
|
|
||||||
case $f in
|
|
||||||
-) echo $tmp/stdin ;;
|
|
||||||
[\\/$]*)
|
|
||||||
# Absolute (can't be DOS-style, as IFS=:)
|
|
||||||
test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
||||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
# Do quote $f, to prevent DOS paths from being IFS'd.
|
|
||||||
echo "$f";;
|
|
||||||
*) # Relative
|
|
||||||
if test -f "$f"; then
|
|
||||||
# Build tree
|
|
||||||
echo "$f"
|
|
||||||
elif test -f "$srcdir/$f"; then
|
|
||||||
# Source tree
|
|
||||||
echo "$srcdir/$f"
|
|
||||||
else
|
|
||||||
# /dev/null tree
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
|
||||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi;;
|
|
||||||
esac
|
|
||||||
done` || { (exit 1); exit 1; }
|
|
||||||
# Remove the trailing spaces.
|
|
||||||
sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
# Transform confdefs.h into two sed scripts, `conftest.defines' and
|
|
||||||
# `conftest.undefs', that substitutes the proper values into
|
|
||||||
# config.h.in to produce config.h. The first handles `#define'
|
|
||||||
# templates, and the second `#undef' templates.
|
|
||||||
# And first: Protect against being on the right side of a sed subst in
|
|
||||||
# config.status. Protect against being in an unquoted here document
|
|
||||||
# in config.status.
|
|
||||||
rm -f conftest.defines conftest.undefs
|
|
||||||
# Using a here document instead of a string reduces the quoting nightmare.
|
|
||||||
# Putting comments in sed scripts is not portable.
|
|
||||||
#
|
|
||||||
# `end' is used to avoid that the second main sed command (meant for
|
|
||||||
# 0-ary CPP macros) applies to n-ary macro definitions.
|
|
||||||
# See the Autoconf documentation for `clear'.
|
|
||||||
cat >confdef2sed.sed <<\_ACEOF
|
|
||||||
s/[\\&,]/\\&/g
|
|
||||||
s,[\\$`],\\&,g
|
|
||||||
t clear
|
|
||||||
: clear
|
|
||||||
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
|
|
||||||
t end
|
|
||||||
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
|
|
||||||
: end
|
|
||||||
_ACEOF
|
|
||||||
# If some macros were called several times there might be several times
|
|
||||||
# the same #defines, which is useless. Nevertheless, we may not want to
|
|
||||||
# sort them, since we want the *last* AC-DEFINE to be honored.
|
|
||||||
uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
|
|
||||||
sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
|
|
||||||
rm -f confdef2sed.sed
|
|
||||||
|
|
||||||
# This sed command replaces #undef with comments. This is necessary, for
|
|
||||||
# example, in the case of _POSIX_SOURCE, which is predefined and required
|
|
||||||
# on some systems where configure will not decide to define it.
|
|
||||||
cat >>conftest.undefs <<\_ACEOF
|
|
||||||
s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
# Break up conftest.defines because some shells have a limit on the size
|
|
||||||
# of here documents, and old seds have small limits too (100 cmds).
|
|
||||||
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
|
|
||||||
echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
|
|
||||||
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
|
|
||||||
echo ' :' >>$CONFIG_STATUS
|
|
||||||
rm -f conftest.tail
|
|
||||||
while grep . conftest.defines >/dev/null
|
|
||||||
do
|
|
||||||
# Write a limited-size here document to $tmp/defines.sed.
|
|
||||||
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
|
|
||||||
# Speed up: don't consider the non `#define' lines.
|
|
||||||
echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
|
|
||||||
# Work around the forget-to-reset-the-flag bug.
|
|
||||||
echo 't clr' >>$CONFIG_STATUS
|
|
||||||
echo ': clr' >>$CONFIG_STATUS
|
|
||||||
sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
|
|
||||||
echo 'CEOF
|
|
||||||
sed -f $tmp/defines.sed $tmp/in >$tmp/out
|
|
||||||
rm -f $tmp/in
|
|
||||||
mv $tmp/out $tmp/in
|
|
||||||
' >>$CONFIG_STATUS
|
|
||||||
sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
|
|
||||||
rm -f conftest.defines
|
|
||||||
mv conftest.tail conftest.defines
|
|
||||||
done
|
|
||||||
rm -f conftest.defines
|
|
||||||
echo ' fi # grep' >>$CONFIG_STATUS
|
|
||||||
echo >>$CONFIG_STATUS
|
|
||||||
|
|
||||||
# Break up conftest.undefs because some shells have a limit on the size
|
|
||||||
# of here documents, and old seds have small limits too (100 cmds).
|
|
||||||
echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
|
|
||||||
rm -f conftest.tail
|
|
||||||
while grep . conftest.undefs >/dev/null
|
|
||||||
do
|
|
||||||
# Write a limited-size here document to $tmp/undefs.sed.
|
|
||||||
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
|
|
||||||
# Speed up: don't consider the non `#undef'
|
|
||||||
echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
|
|
||||||
# Work around the forget-to-reset-the-flag bug.
|
|
||||||
echo 't clr' >>$CONFIG_STATUS
|
|
||||||
echo ': clr' >>$CONFIG_STATUS
|
|
||||||
sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
|
|
||||||
echo 'CEOF
|
|
||||||
sed -f $tmp/undefs.sed $tmp/in >$tmp/out
|
|
||||||
rm -f $tmp/in
|
|
||||||
mv $tmp/out $tmp/in
|
|
||||||
' >>$CONFIG_STATUS
|
|
||||||
sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
|
|
||||||
rm -f conftest.undefs
|
|
||||||
mv conftest.tail conftest.undefs
|
|
||||||
done
|
|
||||||
rm -f conftest.undefs
|
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
||||||
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
||||||
# use $as_me), people would be surprised to read:
|
|
||||||
# /* config.h. Generated by config.status. */
|
|
||||||
if test x"$ac_file" = x-; then
|
|
||||||
echo "/* Generated by configure. */" >$tmp/config.h
|
|
||||||
else
|
|
||||||
echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
|
|
||||||
fi
|
|
||||||
cat $tmp/in >>$tmp/config.h
|
|
||||||
rm -f $tmp/in
|
|
||||||
if test x"$ac_file" != x-; then
|
|
||||||
if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
|
|
||||||
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
|
||||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
|
||||||
else
|
|
||||||
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
||||||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
||||||
X"$ac_file" : 'X\(//\)[^/]' \| \
|
|
||||||
X"$ac_file" : 'X\(//\)$' \| \
|
|
||||||
X"$ac_file" : 'X\(/\)' \| \
|
|
||||||
. : '\(.\)' 2>/dev/null ||
|
|
||||||
echo X"$ac_file" |
|
|
||||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
||||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
||||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
|
||||||
/^X\(\/\).*/{ s//\1/; q; }
|
|
||||||
s/.*/./; q'`
|
|
||||||
{ if $as_mkdir_p; then
|
|
||||||
mkdir -p "$ac_dir"
|
|
||||||
else
|
|
||||||
as_dir="$ac_dir"
|
|
||||||
as_dirs=
|
|
||||||
while test ! -d "$as_dir"; do
|
|
||||||
as_dirs="$as_dir $as_dirs"
|
|
||||||
as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
||||||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
||||||
X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
||||||
X"$as_dir" : 'X\(//\)$' \| \
|
|
||||||
X"$as_dir" : 'X\(/\)' \| \
|
|
||||||
. : '\(.\)' 2>/dev/null ||
|
|
||||||
echo X"$as_dir" |
|
|
||||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
||||||
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
||||||
/^X\(\/\/\)$/{ s//\1/; q; }
|
|
||||||
/^X\(\/\).*/{ s//\1/; q; }
|
|
||||||
s/.*/./; q'`
|
|
||||||
done
|
|
||||||
test ! -n "$as_dirs" || mkdir $as_dirs
|
|
||||||
fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
||||||
echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }; }
|
|
||||||
|
|
||||||
rm -f $ac_file
|
|
||||||
mv $tmp/config.h $ac_file
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
cat $tmp/config.h
|
|
||||||
rm -f $tmp/config.h
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
_ACEOF
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# CONFIG_COMMANDS section.
|
# CONFIG_COMMANDS section.
|
||||||
#
|
#
|
||||||
|
|
@ -6192,8 +5981,7 @@ esac
|
||||||
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
|
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
|
||||||
echo "$as_me: executing $ac_dest commands" >&6;}
|
echo "$as_me: executing $ac_dest commands" >&6;}
|
||||||
case $ac_dest in
|
case $ac_dest in
|
||||||
default ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
default ) if test -n "$CONFIG_FILES"; then
|
||||||
if test -n "$CONFIG_FILES"; then
|
|
||||||
if test -n "${with_target_subdir}"; then
|
if test -n "${with_target_subdir}"; then
|
||||||
# FIXME: We shouldn't need to set ac_file
|
# FIXME: We shouldn't need to set ac_file
|
||||||
ac_file=Makefile
|
ac_file=Makefile
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT
|
AC_INIT
|
||||||
AC_CONFIG_SRCDIR([objc/objc.h])
|
AC_CONFIG_SRCDIR([objc/objc.h])
|
||||||
AC_CONFIG_HEADER(config.h)
|
|
||||||
|
|
||||||
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
||||||
PACKAGE=libobjc
|
PACKAGE=libobjc
|
||||||
|
|
@ -125,34 +124,30 @@ gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([
|
||||||
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
||||||
AC_SUBST(gcc_version)
|
AC_SUBST(gcc_version)
|
||||||
|
|
||||||
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
|
# Calculate toolexeclibdir
|
||||||
case ${version_specific_libs} in
|
case ${version_specific_libs} in
|
||||||
yes)
|
yes)
|
||||||
# Need the gcc compiler version to know where to install libraries
|
# Need the gcc compiler version to know where to install libraries
|
||||||
# and header files if --enable-version-specific-runtime-libs option
|
# and header files if --enable-version-specific-runtime-libs option
|
||||||
# is selected.
|
# is selected.
|
||||||
glibcpp_toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
|
toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
||||||
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
|
||||||
;;
|
;;
|
||||||
no)
|
no)
|
||||||
if test -n "$with_cross_host" &&
|
if test -n "$with_cross_host" &&
|
||||||
test x"$with_cross_host" != x"no"; then
|
test x"$with_cross_host" != x"no"; then
|
||||||
glibcpp_toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
|
||||||
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
|
|
||||||
else
|
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||||
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
toolexeclibdir='$(toolexecdir)/lib'
|
||||||
glibcpp_toolexeclibdir='$(libdir)'
|
else
|
||||||
|
toolexeclibdir='$(libdir)'
|
||||||
fi
|
fi
|
||||||
multi_os_directory=`$CC -print-multi-os-directory`
|
multi_os_directory=`$CC -print-multi-os-directory`
|
||||||
case $multi_os_directory in
|
case $multi_os_directory in
|
||||||
.) ;; # Avoid trailing /.
|
.) ;; # Avoid trailing /.
|
||||||
*) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
|
*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST(glibcpp_toolexecdir)
|
AC_SUBST(toolexeclibdir)
|
||||||
AC_SUBST(glibcpp_toolexeclibdir)
|
|
||||||
|
|
||||||
glibcpp_prefixdir=${prefix}
|
glibcpp_prefixdir=${prefix}
|
||||||
AC_SUBST(glibcpp_prefixdir)
|
AC_SUBST(glibcpp_prefixdir)
|
||||||
|
|
@ -218,8 +213,7 @@ AC_SUBST(GTHREAD_FLAGS)
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
|
|
||||||
AC_CONFIG_COMMANDS([default],
|
AC_CONFIG_COMMANDS([default],
|
||||||
[[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
[[if test -n "$CONFIG_FILES"; then
|
||||||
if test -n "$CONFIG_FILES"; then
|
|
||||||
if test -n "${with_target_subdir}"; then
|
if test -n "${with_target_subdir}"; then
|
||||||
# FIXME: We shouldn't need to set ac_file
|
# FIXME: We shouldn't need to set ac_file
|
||||||
ac_file=Makefile
|
ac_file=Makefile
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue