Mercurial > hg > xemacs-beta

comparison configure.in @ 165:5a88923fcbfe r20-3b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b9
author cvs
date Mon, 13 Aug 2007 09:44:42 +0200
parents 0132846995bd
children 85ec50267440
comparison
equal deleted inserted replaced
164:4e0740e5aab2 165:5a88923fcbfe
1747 #endif /* 0 */ 1747 #endif /* 0 */
1748 ' > $tempcname 1748 ' > $tempcname
1749 dnl The value of CPP is a quoted variable reference, so we need to do this 1749 dnl The value of CPP is a quoted variable reference, so we need to do this
1750 dnl to get its actual value... 1750 dnl to get its actual value...
1751 CPP=`eval "echo $CPP"` 1751 CPP=`eval "echo $CPP"`
1752 define(TAB, [ ])dnl
1753 changequote(, )dnl
1752 eval `$CPP -Isrc $tempcname \ 1754 eval `$CPP -Isrc $tempcname \
1753 | [sed -n -e "s/[ \t]*=[ \t\"]*/='/" -e "s/[ \t\"]*\$/'/" -e "s/^configure___//p"`] 1755 | sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
1754 1756 changequote([, ])dnl
1755 dnl if test -z "$SPECIFIED_CFLAGS"; then 1757 dnl if test -z "$SPECIFIED_CFLAGS"; then
1756 dnl eval `$CPP -Isrc -DTHIS_IS_CONFIGURE $tempcname \ 1758 dnl eval `$CPP -Isrc -DTHIS_IS_CONFIGURE $tempcname \
1757 dnl | sed -n -e "s/ *=[[ \"]]*/='/" -e "s/[[ \"]]*\$/'/" -e "s/^configure___//p"` 1759 dnl | sed -n -e "s/ *=[[ \"]]*/='/" -e "s/[[ \"]]*\$/'/" -e "s/^configure___//p"`
1758 dnl else 1760 dnl else
1759 dnl REAL_CFLAGS="$CFLAGS" 1761 dnl REAL_CFLAGS="$CFLAGS"
1876 test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_site) 1878 test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_site)
1877 done 1879 done
1878 1880
1879 dnl --site-runtime-libraries (multiple dirs) 1881 dnl --site-runtime-libraries (multiple dirs)
1880 if test -n "$site_runtime_libraries" ; then 1882 if test -n "$site_runtime_libraries" ; then
1881 LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ */:/'`" 1883 LD_RUN_PATH="`echo $site_runtime_libraries | sed -e 's/ */:/g'`"
1882 export LD_RUN_PATH 1884 export LD_RUN_PATH
1883 fi 1885 fi
1884 1886
1885 dnl ------------------------------------- 1887 dnl -------------------------------------
1886 dnl Compute runtime library path 1888 dnl Compute runtime library path
1935 1937
1936 dnl XE_COMPUTE_RUNPATH() 1938 dnl XE_COMPUTE_RUNPATH()
1937 define([XE_COMPUTE_RUNPATH],[ 1939 define([XE_COMPUTE_RUNPATH],[
1938 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then 1940 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
1939 dnl Remove runtime paths from current ld switches 1941 dnl Remove runtime paths from current ld switches
1940 ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//"` 1942 ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//g"`
1941 ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//"` 1943 ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//g"`
1942 dnl PRINT_VAR(ld_switch_site ld_switch_x_site) 1944 dnl PRINT_VAR(ld_switch_site ld_switch_x_site)
1943 1945
1944 dnl Fix up Runtime path 1946 dnl Fix up Runtime path
1945 dnl If LD_RUN_PATH is set in environment, use that. 1947 dnl If LD_RUN_PATH is set in environment, use that.
1946 dnl In this case, assume user has set the right value. 1948 dnl In this case, assume user has set the right value.
2126 fi 2128 fi
2127 else AC_MSG_RESULT(no) 2129 else AC_MSG_RESULT(no)
2128 fi 2130 fi
2129 2131
2130 dnl Link with "-z ignore" on Solaris if supported 2132 dnl Link with "-z ignore" on Solaris if supported
2131 if test "$opsys" = "sol2" -a "${OS_RELEASE:-0}" -ge 56; then 2133 if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
2132 AC_MSG_CHECKING(for \"-z ignore\" linker flag) 2134 AC_MSG_CHECKING(for \"-z ignore\" linker flag)
2133 case "`ld -h 2>&1`" in 2135 case "`ld -h 2>&1`" in
2134 *-z\ ignore\|record* ) AC_MSG_RESULT(yes) 2136 *-z\ ignore\|record* ) AC_MSG_RESULT(yes)
2135 XE_PREPEND(-z ignore, ld_switch_site) ;; 2137 XE_PREPEND(-z ignore, ld_switch_site) ;;
2136 *) AC_MSG_RESULT(no) ;; 2138 *) AC_MSG_RESULT(no) ;;
3476 dnl except ./Makefile from $srcdir/Makefile.in 3478 dnl except ./Makefile from $srcdir/Makefile.in
3477 3479
3478 AC_OUTPUT($internal_makefile_list,[ 3480 AC_OUTPUT($internal_makefile_list,[
3479 for dir in $MAKE_SUBDIR; do 3481 for dir in $MAKE_SUBDIR; do
3480 echo creating $dir/Makefile 3482 echo creating $dir/Makefile
3481 ([ 3483 (
3484 changequote(<<, >>)dnl
3482 cd $dir 3485 cd $dir
3483 rm -f junk.c 3486 rm -f junk.c
3484 < Makefile.in \ 3487 < Makefile.in \
3485 sed -e 's/^# Generated.*//' \ 3488 sed -e '/^# Generated/d' \
3486 -e 's%/\*\*/#.*%%' \ 3489 -e 's%/\*\*/#.*%%' \
3487 -e 's/^[ \f\t]*#[ \f\t]*/#/' \ 3490 -e 's/^ *# */#/' \
3488 -e '/^##/d' \ 3491 -e '/^##/d' \
3489 -e '/^#/ { 3492 -e '/^#/ {
3490 p 3493 p
3491 d 3494 d
3492 }' -e '/./ { 3495 }' -e '/./ {
3495 s/$/"/ 3498 s/$/"/
3496 }' > junk.c; 3499 }' > junk.c;
3497 $CPP -I. -I${top_srcdir}/src $CPPFLAGS junk.c > junk.cpp; 3500 $CPP -I. -I${top_srcdir}/src $CPPFLAGS junk.c > junk.cpp;
3498 < junk.cpp \ 3501 < junk.cpp \
3499 sed -e 's/^#.*//' \ 3502 sed -e 's/^#.*//' \
3500 -e 's/^[ \f\t][ \f\t]*$//' \ 3503 -e 's/^[ TAB][ TAB]*$//' \
3501 -e 's/^ / /' \ 3504 -e 's/^ /TAB/' \
3502 | sed -n -e '/^..*$/p' \ 3505 | sed -n -e '/^..*$/p' \
3503 | sed '/^"/ { 3506 | sed '/^"/ {
3504 s/\\\([\"]\)/\1/g 3507 s/\\\([\"]\)/\1/g
3505 s/^"// 3508 s/^"//
3506 s/"$// 3509 s/"$//
3507 }' > Makefile.new 3510 }' > Makefile.new
3508 chmod 444 Makefile.new 3511 chmod 444 Makefile.new
3509 mv -f Makefile.new Makefile 3512 mv -f Makefile.new Makefile
3510 rm -f junk.c junk.cpp 3513 rm -f junk.c junk.cpp
3511 ]) 3514 changequote([, ])dnl
3515 )
3512 done 3516 done
3513 ], 3517 ],
3514 [CPP="$CPP" 3518 [CPP="$CPP"
3515 CPPFLAGS="$CPPFLAGS" 3519 CPPFLAGS="$CPPFLAGS"
3516 top_srcdir="$srcdir" 3520 top_srcdir="$srcdir"