comparison configure @ 14:9ee227acff29 r19-15b90

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents 49a24b4fd526
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
1530 ### matter, be sure /etc/MACHINES says something about it. 1530 ### matter, be sure /etc/MACHINES says something about it.
1531 ### 1531 ###
1532 ### Eric Raymond says we should accept strings like "sysvr4" to mean 1532 ### Eric Raymond says we should accept strings like "sysvr4" to mean
1533 ### "System V Release 4"; he writes, "The old convention encouraged 1533 ### "System V Release 4"; he writes, "The old convention encouraged
1534 ### confusion between `system' and `release' levels'." 1534 ### confusion between `system' and `release' levels'."
1535 ###
1536 ### We rely on cpp to generate makefiles from Makefile.in.in templates.
1537 ### There is at least one drawback to that. Since cpp generally has
1538 ### built-in macro definitions like `#define unix' or `#define i386',
1539 ### we must be careful to prevent it from substituting these occurences
1540 ### in certain places in the makefiles. Pathnames for architecture-
1541 ### specific files come to mind.
1542 ### This is where CPPFLAGS_MAKEFILEGEN comes in. We try to selectively
1543 ### disable (potentially) predefined macros that we find to be part of
1544 ### the configuration string.
1545 ### This is but a poor method to help us fight off cpp, but it covers
1546 ### those cases that used to bite me. <mdiers@logware.de>
1547
1548 CPPFLAGS_MAKEFILEGEN="" # we normally do not need any extra flags
1535 1549
1536 machine='' opsys='' unported=no need_dynodump=no 1550 machine='' opsys='' unported=no need_dynodump=no
1537 case "${canonical}" in 1551 case "${canonical}" in
1538 1552
1539 ## NetBSD ports 1553 ## NetBSD ports
1806 ## XEmacs changes here for shared. 1820 ## XEmacs changes here for shared.
1807 hppa*-hp-hpux7* ) 1821 hppa*-hp-hpux7* )
1808 machine=hp800 opsys=hpux NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa" 1822 machine=hp800 opsys=hpux NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
1809 ;; 1823 ;;
1810 hppa*-hp-hpux8*shr* ) 1824 hppa*-hp-hpux8*shr* )
1811 machine=hp800 opsys=hpux8-shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa" 1825 machine=hp800 opsys=hpux8*shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
1812 ;; 1826 ;;
1813 hppa*-hp-hpux8* ) 1827 hppa*-hp-hpux8* )
1814 machine=hp800 opsys=hpux8 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa" 1828 machine=hp800 opsys=hpux8 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
1815 ;; 1829 ;;
1816 hppa*-hp-hpux9*shr* ) 1830 hppa*-hp-hpux9*shr* )
1817 machine=hp800 opsys=hpux9-shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa" 1831 machine=hp800 opsys=hpux9*shr NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
1818 ;; 1832 ;;
1819 hppa*-hp-hpux9* ) 1833 hppa*-hp-hpux9* )
1820 machine=hp800 opsys=hpux9 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa" 1834 machine=hp800 opsys=hpux9 NON_GNU_CPP="cc -Aa -E" NON_GNU_CC="cc -Aa"
1821 ;; 1835 ;;
1822 hppa*-hp-hpux10*shr* ) 1836 hppa*-hp-hpux10*shr* )
2258 ;; 2272 ;;
2259 2273
2260 ## Intel 386 machines where we don't care about the manufacturer 2274 ## Intel 386 machines where we don't care about the manufacturer
2261 i[3-9]86-*-* ) 2275 i[3-9]86-*-* )
2262 machine=intel386 2276 machine=intel386
2277 CPPFLAGS_MAKEFILEGEN="${CPPFLAGS_MAKEFILEGEN} -Ui386"
2263 case "${canonical}" in 2278 case "${canonical}" in
2264 *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; 2279 *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
2265 *-isc2.2* ) opsys=isc2-2 ;; 2280 *-isc2.2* ) opsys=isc2-2 ;;
2266 *-isc4.0* ) opsys=isc4-0 ;; 2281 *-isc4.0* ) opsys=isc4-0 ;;
2267 *-isc4.* ) opsys=isc4-1 2282 *-isc4.* ) opsys=isc4-1
2288 if [ "${dynamic}" = "yes" ]; then 2303 if [ "${dynamic}" = "yes" ]; then
2289 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF" ; 2304 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF" ;
2290 else 2305 else
2291 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE" ; 2306 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE" ;
2292 fi ;; 2307 fi ;;
2293 *-386bsd* ) opsys=386bsd ;; 2308 *-386bsd* ) opsys=386bsd ;;
2294 *-freebsd* ) opsys=freebsd ;; 2309 *-freebsd* ) opsys=freebsd ;;
2295 *-nextstep* ) opsys=nextstep ;; 2310 *-nextstep* ) opsys=nextstep ;;
2296 ## Otherwise, we'll fall through to the generic opsys code at the bottom. 2311 ## Otherwise, we'll fall through to the generic opsys code at the bottom.
2297 esac 2312 esac
2298 ;; 2313 ;;
2299 2314
2542 fi 2557 fi
2543 2558
2544 #### Some systems specify a CPP to use unless we are using GCC. 2559 #### Some systems specify a CPP to use unless we are using GCC.
2545 #### Now that we know whether we are using GCC, we can decide whether 2560 #### Now that we know whether we are using GCC, we can decide whether
2546 #### to use that one. 2561 #### to use that one.
2547 if [ "x$NON_GNU_CPP" = x ] || [ x$GCC = x1 ] 2562
2548 then true 2563 if [ "x$GCC" = x1 ] || [ "x$NON_GNU_CPP" = x ] ; then
2564 true
2549 else 2565 else
2550 if [ "x$CPP" = x ]; then 2566 if [ "x$CPP" = x ]; then
2551 if [ "${with_lcc}" = "yes" ] && [ "${NON_GNU_CPP}" = "yes" ] ; then 2567 if [ "${with_lcc}" = "yes" ] && [ "${NON_GNU_CPP}" = "yes" ] ; then
2552 CPP='gcc -E -traditional' # cross fingers and hope it's there.... 2568 CPP='gcc -E -traditional' # cross fingers and hope it's there....
2553 else 2569 else
3935 if test "${window_system}" != "none" ; then 3951 if test "${window_system}" != "none" ; then
3936 test -n "$silent" || echo "checking for XFree86" 3952 test -n "$silent" || echo "checking for XFree86"
3937 if test -d /usr/X386/include; then 3953 if test -d /usr/X386/include; then
3938 HAVE_XFREE386=yes 3954 HAVE_XFREE386=yes
3939 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" 3955 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include"
3940 elif test -d /usr/X11R6/include; then 3956 elif test -f /etc/XF86Config -o \
3957 -f /etc/X11/XF86Config -o \
3958 -f /usr/X11R6/lib/X11/XF86Config; then
3941 HAVE_XFREE386=yes 3959 HAVE_XFREE386=yes
3942 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X11R6/include" 3960 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X11R6/include"
3943 else 3961 else
3944 HAVE_XFREE386=no 3962 HAVE_XFREE386=no
3945 fi 3963 fi
8494 makefile_command='echo "creating src/Makefile"; 8512 makefile_command='echo "creating src/Makefile";
8495 topsrcdir='"${topsrcdir}"'; 8513 topsrcdir='"${topsrcdir}"';
8496 ( cd ./src; 8514 ( cd ./src;
8497 rm -f junk.c; 8515 rm -f junk.c;
8498 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c; 8516 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
8499 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`; 8517 eval `echo ${CPP} ${CPPFLAGS_MAKEFILEGEN} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
8500 < junk.cpp '\ 8518 < junk.cpp '\
8501 ' sed -e '\''s/^#.*//'\'' '\ 8519 ' sed -e '\''s/^#.*//'\'' '\
8502 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\ 8520 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\
8503 ' -e '\''s/^ / /'\'' '\ 8521 ' -e '\''s/^ / /'\'' '\
8504 ' | sed -n -e '\''/^..*$/p'\'' '\ 8522 ' | sed -n -e '\''/^..*$/p'\'' '\
8511 lwlib_makefile_command='echo "creating lwlib/Makefile"; 8529 lwlib_makefile_command='echo "creating lwlib/Makefile";
8512 topsrcdir='"${topsrcdir}"'; 8530 topsrcdir='"${topsrcdir}"';
8513 ( cd ./lwlib; 8531 ( cd ./lwlib;
8514 rm -f junk.c; 8532 rm -f junk.c;
8515 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c; 8533 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
8516 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`; 8534 eval `echo ${CPP} ${CPPFLAGS_MAKEFILEGEN} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
8517 < junk.cpp '\ 8535 < junk.cpp '\
8518 ' sed -e '\''s/^#.*//'\'' '\ 8536 ' sed -e '\''s/^#.*//'\'' '\
8519 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\ 8537 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\
8520 ' -e '\''s/^ / /'\'' '\ 8538 ' -e '\''s/^ / /'\'' '\
8521 ' | sed -n -e '\''/^..*$/p'\'' '\ 8539 ' | sed -n -e '\''/^..*$/p'\'' '\
8528 lib_src_makefile_command='echo "creating lib-src/Makefile"; 8546 lib_src_makefile_command='echo "creating lib-src/Makefile";
8529 topsrcdir='"${topsrcdir}"'; 8547 topsrcdir='"${topsrcdir}"';
8530 ( cd ./lib-src; 8548 ( cd ./lib-src;
8531 rm -f junk.c; 8549 rm -f junk.c;
8532 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c; 8550 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
8533 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`; 8551 eval `echo ${CPP} ${CPPFLAGS_MAKEFILEGEN} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
8534 < junk.cpp '\ 8552 < junk.cpp '\
8535 ' sed -e '\''s/^#.*//'\'' '\ 8553 ' sed -e '\''s/^#.*//'\'' '\
8536 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\ 8554 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\
8537 ' -e '\''s/^ / /'\'' '\ 8555 ' -e '\''s/^ / /'\'' '\
8538 ' | sed -n -e '\''/^..*$/p'\'' '\ 8556 ' | sed -n -e '\''/^..*$/p'\'' '\
8545 dynodump_makefile_command='echo "creating dynodump/Makefile"; 8563 dynodump_makefile_command='echo "creating dynodump/Makefile";
8546 topsrcdir='"${topsrcdir}"'; 8564 topsrcdir='"${topsrcdir}"';
8547 ( cd ./dynodump; 8565 ( cd ./dynodump;
8548 rm -f junk.c; 8566 rm -f junk.c;
8549 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c; 8567 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
8550 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`; 8568 eval `echo ${CPP} ${CPPFLAGS_MAKEFILEGEN} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
8551 < junk.cpp '\ 8569 < junk.cpp '\
8552 ' sed -e '\''s/^#.*//'\'' '\ 8570 ' sed -e '\''s/^#.*//'\'' '\
8553 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\ 8571 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\
8554 ' -e '\''s/^ / /'\'' '\ 8572 ' -e '\''s/^ / /'\'' '\
8555 ' | sed -n -e '\''/^..*$/p'\'' '\ 8573 ' | sed -n -e '\''/^..*$/p'\'' '\
8563 energize_makefile_command='echo "creating lwlib/energize/Makefile"; 8581 energize_makefile_command='echo "creating lwlib/energize/Makefile";
8564 topsrcdir='"${topsrcdir}"'; 8582 topsrcdir='"${topsrcdir}"';
8565 ( cd ./lwlib/energize; 8583 ( cd ./lwlib/energize;
8566 rm -f junk.c; 8584 rm -f junk.c;
8567 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c; 8585 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
8568 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`; 8586 eval `echo ${CPP} ${CPPFLAGS_MAKEFILEGEN} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
8569 < junk.cpp '\ 8587 < junk.cpp '\
8570 ' sed -e '\''s/^#.*//'\'' '\ 8588 ' sed -e '\''s/^#.*//'\'' '\
8571 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\ 8589 ' -e '\''s/^[ \f\t][ \f\t]*$//'\'' '\
8572 ' -e '\''s/^ / /'\'' '\ 8590 ' -e '\''s/^ / /'\'' '\
8573 ' | sed -n -e '\''/^..*$/p'\'' '\ 8591 ' | sed -n -e '\''/^..*$/p'\'' '\