Mercurial > emacs

comparison configure @ 96466:33ec067952ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Regnerate.
author Glenn Morris <rgm@gnu.org>
date Tue, 01 Jul 2008 03:14:10 +0000
parents ddedcecb18ef
children 44db09925e6f
comparison
equal deleted inserted replaced
96465:f9c7bc38ee36 96466:33ec067952ba
24151 test "${prefix}" != NONE && 24151 test "${prefix}" != NONE &&
24152 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` 24152 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
24153 test "${exec_prefix}" != NONE && 24153 test "${exec_prefix}" != NONE &&
24154 exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` 24154 exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
24155 24155
24156 # Now get this: Some word that is part of the ${srcdir} directory name
24157 # or the ${configuration} value might, just might, happen to be an
24158 # identifier like `sun4' or `i386' or something, and be predefined by
24159 # the C preprocessor to some helpful value like 1, or maybe the empty
24160 # string. Needless to say consequent macro substitutions are less
24161 # than conducive to the makefile finding the correct directory.
24162 cpp_undefs="`echo $srcdir $configuration $canonical |
24163 sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
24164 -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"
24165
24156 ## Check if the C preprocessor will convert `..' to `. .'. If so, set 24166 ## Check if the C preprocessor will convert `..' to `. .'. If so, set
24157 ## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile 24167 ## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile
24158 ## from Makefile.c can correctly provide the arg `-traditional' to the 24168 ## from Makefile.c can correctly provide the arg `-traditional' to the
24159 ## C preprocessor. 24169 ## C preprocessor.
24160 24170
24729 _ACEOF 24739 _ACEOF
24730 cat >>$CONFIG_STATUS <<_ACEOF 24740 cat >>$CONFIG_STATUS <<_ACEOF
24731 # 24741 #
24732 # INIT-COMMANDS 24742 # INIT-COMMANDS
24733 # 24743 #
24734 GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" 24744 GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" cpp_undefs="$cpp_undefs"
24735 24745
24736 _ACEOF 24746 _ACEOF
24737 24747
24738 cat >>$CONFIG_STATUS <<\_ACEOF 24748 cat >>$CONFIG_STATUS <<\_ACEOF
24739 24749
25390 25400
25391 # Build src/Makefile from ${srcdir}/src/Makefile.c 25401 # Build src/Makefile from ${srcdir}/src/Makefile.c
25392 # and lib-src/Makefile from ${srcdir}/lib-src/Makefile.c 25402 # and lib-src/Makefile from ${srcdir}/lib-src/Makefile.c
25393 # This must be done after src/config.h is built, since we rely on that file. 25403 # This must be done after src/config.h is built, since we rely on that file.
25394 25404
25395 # Now get this: Some word that is part of the ${srcdir} directory name
25396 # or the ${configuration} value might, just might, happen to be an
25397 # identifier like `sun4' or `i386' or something, and be predefined by
25398 # the C preprocessor to some helpful value like 1, or maybe the empty
25399 # string. Needless to say consequent macro substitutions are less
25400 # than conducive to the makefile finding the correct directory.
25401 undefs="`echo $top_srcdir $configuration $canonical |
25402 sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
25403 -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \
25404 `"
25405
25406 echo creating src/epaths.h 25405 echo creating src/epaths.h
25407 ${MAKE-make} epaths-force 25406 ${MAKE-make} epaths-force
25408 25407
25409 # As of 2000-11-19, newest development versions of GNU cpp preprocess 25408 # As of 2000-11-19, newest development versions of GNU cpp preprocess
25410 # `..' to `. .' unless invoked with -traditional 25409 # `..' to `. .' unless invoked with -traditional
25419 sed -e '/start of cpp stuff/q' \ 25418 sed -e '/start of cpp stuff/q' \
25420 < Makefile.c > junk1.c 25419 < Makefile.c > junk1.c
25421 sed -e '1,/start of cpp stuff/d'\ 25420 sed -e '1,/start of cpp stuff/d'\
25422 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ 25421 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
25423 < Makefile.c > junk.c 25422 < Makefile.c > junk.c
25424 $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ 25423 $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
25425 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c 25424 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
25426 cat junk1.c junk2.c > Makefile.new 25425 cat junk1.c junk2.c > Makefile.new
25427 rm -f junk.c junk1.c junk2.c 25426 rm -f junk.c junk1.c junk2.c
25428 chmod 444 Makefile.new 25427 chmod 444 Makefile.new
25429 mv -f Makefile.new Makefile 25428 mv -f Makefile.new Makefile
25435 sed -e '/start of cpp stuff/q' \ 25434 sed -e '/start of cpp stuff/q' \
25436 < Makefile.c > junk1.c 25435 < Makefile.c > junk1.c
25437 sed -e '1,/start of cpp stuff/d'\ 25436 sed -e '1,/start of cpp stuff/d'\
25438 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ 25437 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
25439 < Makefile.c > junk.c 25438 < Makefile.c > junk.c
25440 $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ 25439 $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
25441 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c 25440 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
25442 cat junk1.c junk2.c > Makefile.new 25441 cat junk1.c junk2.c > Makefile.new
25443 rm -f junk.c junk1.c junk2.c 25442 rm -f junk.c junk1.c junk2.c
25444 chmod 444 Makefile.new 25443 chmod 444 Makefile.new
25445 mv -f Makefile.new Makefile 25444 mv -f Makefile.new Makefile