Mercurial > emacs

comparison configure @ 108480:3b8651a494dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 11 May 2010 04:09:05 +0000
parents 2b195069f0d5
children 0db9ef2f88bd
comparison
equal deleted inserted replaced
108474:e05d1f835527 108480:3b8651a494dc
26688 CPP_NEED_TRADITIONAL=yes 26688 CPP_NEED_TRADITIONAL=yes
26689 fi 26689 fi
26690 rm -f conftest* 26690 rm -f conftest*
26691 26691
26692 26692
26693 ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" 26693 ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile"
26694 26694
26695 ac_config_commands="$ac_config_commands default" 26695 ac_config_commands="$ac_config_commands default"
26696 26696
26697 cat >confcache <<\_ACEOF 26697 cat >confcache <<\_ACEOF
26698 # This file is a shell script that caches the results of configure 26698 # This file is a shell script that caches the results of configure
27287 for ac_config_target in $ac_config_targets 27287 for ac_config_target in $ac_config_targets
27288 do 27288 do
27289 case $ac_config_target in 27289 case $ac_config_target in
27290 "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; 27290 "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;;
27291 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 27291 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
27292 "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; 27292 "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;;
27293 "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; 27293 "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;;
27294 "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;; 27294 "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;;
27295 "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;; 27295 "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
27296 "doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispintro/Makefile" ;; 27296 "doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispintro/Makefile" ;;
27297 "doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" ;; 27297 "doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" ;;
27933 27933
27934 if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then 27934 if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then
27935 CPPFLAGS="$CPPFLAGS -traditional" 27935 CPPFLAGS="$CPPFLAGS -traditional"
27936 fi 27936 fi
27937 27937
27938 echo creating lib-src/Makefile
27939 ( cd lib-src
27940 rm -f junk.c junk1.c junk2.c
27941 sed -e '/start of cpp stuff/q' \
27942 < Makefile.c > junk1.c
27943 sed -e '1,/start of cpp stuff/d'\
27944 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
27945 < Makefile.c > junk.c
27946 $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
27947 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
27948 cat junk1.c junk2.c > Makefile.new
27949 rm -f junk.c junk1.c junk2.c
27950 chmod 444 Makefile.new
27951 mv -f Makefile.new Makefile
27952 )
27953
27954 echo creating src/Makefile 27938 echo creating src/Makefile
27955 ( cd src 27939 ( cd src
27956 rm -f junk.c junk1.c junk2.c 27940 rm -f junk.c junk1.c junk2.c
27957 sed -e '/start of cpp stuff/q' \ 27941 sed -e '/start of cpp stuff/q' \
27958 < Makefile.c > junk1.c 27942 < Makefile.c > junk1.c