Changeset 1394 for trunk/src/gcc/configure
- Timestamp:
- Apr 28, 2004, 6:58:06 AM (21 years ago)
- File:
-
- 1 edited
-
trunk/src/gcc/configure (modified) (23 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gcc/configure
-
Property cvs2svn:cvs-rev
changed from
1.2to1.3
r1393 r1394 4 4 5 5 # Configuration script 6 # Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001 7 # Free Software Foundation, Inc.6 # Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 7 # 2002 Free Software Foundation, Inc. 8 8 9 9 # This program is free software; you can redistribute it and/or modify … … 90 90 target_makefile_frag= 91 91 undefs=NOUNDEFS 92 version="$Revision: 1.4 0.6.3$"92 version="$Revision: 1.49 $" 93 93 x11=default 94 94 bindir='${exec_prefix}/bin' … … 153 153 progname=$0 154 154 # if PWD already has a value, it is probably wrong. 155 if [ -n "$PWD" ]; then PWD=` pwd`; fi155 if [ -n "$PWD" ]; then PWD=`${PWDCMD-pwd}`; fi 156 156 157 157 case "${progname}" in … … 159 159 */*) ;; 160 160 *) 161 PATH=$PATH:${PWD=` pwd`} ; export PATH161 PATH=$PATH:${PWD=`${PWDCMD-pwd}`} ; export PATH 162 162 ;; 163 163 esac … … 527 527 moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'` 528 528 ## the sed command below emulates the dirname command 529 topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; pwd`529 topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; ${PWDCMD-pwd}` 530 530 531 531 … … 567 567 exit 1 568 568 fi 569 pwd=` pwd`570 srcpwd=`cd ${srcdir} ; pwd`569 pwd=`${PWDCMD-pwd}` 570 srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` 571 571 if [ "${pwd}" = "${srcpwd}" ] ; then 572 572 srcdir=. … … 580 580 *) 581 581 if [ -f ${srcdir}/config.status ] ; then 582 echo '***' Cannot configure here in \"${PWD=` pwd`}\" when \"${srcdir}\" is currently configured. 1>&2582 echo '***' Cannot configure here in \"${PWD=`${PWDCMD-pwd}`}\" when \"${srcdir}\" is currently configured. 1>&2 583 583 exit 1 584 584 fi … … 709 709 case "${srctrigger}" in 710 710 "") 711 echo '***' srctrigger not set in ${PWD=` pwd`}/configure.in. 1>&2711 echo '***' srctrigger not set in ${PWD=`${PWDCMD-pwd}`}/configure.in. 1>&2 712 712 exit 1 713 713 ;; … … 779 779 if [ ! -r ${srcdir}/${srctrigger} ] ; then 780 780 case "${srcdirdefaulted}" in 781 "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=` pwd`}/${srcdir}" 1>&2 ;;782 *) echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=` pwd`}/. or ${PWD=`pwd`}/.." 1>&2 ;;781 "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`${PWDCMD-pwd}`}/${srcdir}" 1>&2 ;; 782 *) echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`${PWDCMD-pwd}`}/. or ${PWD=`${PWDCMD-pwd}`}/.." 1>&2 ;; 783 783 esac 784 784 … … 918 918 tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD" 919 919 tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET" 920 tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"921 tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"920 tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET BUILD_PREFIX" 921 tools="${tools} BUILD_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM" 922 922 tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET" 923 923 tools="${tools} WINDRES WINDRES_FOR_TARGET YACC" … … 956 956 DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool} 957 957 GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}} 958 HOST_PREFIX=${build_alias}-959 HOST_PREFIX_1=${build_alias}-958 BUILD_PREFIX=${build_alias}- 959 BUILD_PREFIX_1=${build_alias}- 960 960 LD=${LD-${host_alias}-ld} 961 961 LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld} … … 1073 1073 export CXXFLAGS 1074 1074 1075 # FIXME: This should be in configure.in, not configure1076 case "$host" in1077 *go32*)1078 enable_gdbtk=no ;;1079 *msdosdjgpp*)1080 enable_gdbtk=no ;;1081 esac1082 1083 # FIXME: This should be in configure.in, not configure1084 # Determine whether gdb needs tk/tcl or not.1085 if [ "$enable_gdbtk" != "no" ]; then1086 GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"1087 else1088 GDB_TK=""1089 fi1090 1091 1075 all_build_modules= 1092 1076 if test x"${build_alias}" != x"${host_alias}" … … 1125 1109 true 1126 1110 else 1127 echo '***' "${progname}: could not make ${PWD=` pwd`}/${subdir}" 1>&21111 echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${subdir}" 1>&2 1128 1112 exit 1 1129 1113 fi … … 1224 1208 else 1225 1209 echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2 1226 echo '***' is missing in ${PWD=` pwd`}. 1>&21210 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 1227 1211 cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem 1228 1212 fi … … 1260 1244 else 1261 1245 echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2 1262 echo '***' is missing in ${PWD=` pwd`}. 1>&21246 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 1263 1247 mv ${Makefile} ${subdir}/Makefile.tem 1264 1248 fi … … 1296 1280 else 1297 1281 echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2 1298 echo '***' is missing in ${PWD=` pwd`}. 1>&21282 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 1299 1283 mv ${Makefile} ${subdir}/Makefile.tem 1300 1284 fi … … 1373 1357 sedtemp=sed.$$ 1374 1358 cat >$sedtemp <<EOF 1375 s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}: 1376 s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}: 1359 s:@configdirs@:${configdirs}: 1377 1360 EOF 1378 1361 sed -f $sedtemp \ … … 1382 1365 mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem 1383 1366 fi 1384 sed -e "s| ^prefix[ ]*=.*$|prefix =${prefix}|" \1385 -e "s| ^exec_prefix[ ]*=.*$|exec_prefix =${exec_prefix}|" \1386 -e "s| ^bindir[ ]*=.*$|bindir =${bindir}|" \1387 -e "s| ^sbindir[ ]*=.*$|sbindir =${sbindir}|" \1388 -e "s| ^libexecdir[ ]*=.*$|libexecdir =${libexecdir}|" \1389 -e "s| ^datadir[ ]*=.*$|datadir =${datadir}|" \1390 -e "s| ^sysconfdir[ ]*=.*$|sysconfdir =${sysconfdir}|" \1391 -e "s| ^sharedstatedir[ ]*=.*$|sharedstatedir =${sharedstatedir}|" \1392 -e "s| ^localstatedir[ ]*=.*$|localstatedir =${localstatedir}|" \1393 -e "s| ^libdir[ ]*=.*$|libdir =${libdir}|" \1394 -e "s| ^includedir[ ]*=.*$|includedir =${includedir}|" \1395 -e "s| ^oldincludedir[ ]*=.*$|oldincludedir =${oldincludedir}|" \1396 -e "s| ^infodir[ ]*=.*$|infodir =${infodir}|" \1397 -e "s| ^mandir[ ]*=.*$|mandir =${mandir}|" \1398 -e "s| ^ALL_BUILD_MODULES =.*|ALL_BUILD_MODULES =${all_build_modules}|" \1367 sed -e "s|@prefix@|${prefix}|" \ 1368 -e "s|@exec_prefix@|${exec_prefix}|" \ 1369 -e "s|@bindir@|${bindir}|" \ 1370 -e "s|@sbindir@|${sbindir}|" \ 1371 -e "s|@libexecdir@|${libexecdir}|" \ 1372 -e "s|@datadir@|${datadir}|" \ 1373 -e "s|@sysconfdir@|${sysconfdir}|" \ 1374 -e "s|@sharedstatedir@|${sharedstatedir}|" \ 1375 -e "s|@localstatedir@|${localstatedir}|" \ 1376 -e "s|@libdir@|${libdir}|" \ 1377 -e "s|@includedir@|${includedir}|" \ 1378 -e "s|@oldincludedir@|${oldincludedir}|" \ 1379 -e "s|@infodir@|${infodir}|" \ 1380 -e "s|@mandir@|${mandir}|" \ 1381 -e "s|@all_build_modules@|${all_build_modules}|" \ 1399 1382 -e "/^CC[ ]*=/{ 1400 1383 :loop1 … … 1425 1408 s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% 1426 1409 }" \ 1427 -e "s| ^SHELL[ ]*=.*$|SHELL =${config_shell}|" \1428 -e "s| ^srcdir[ ]*=.*$|srcdir =${makesrcdir}|" \1410 -e "s|@config_shell@|${config_shell}|" \ 1411 -e "s|@srcdir@|${makesrcdir}|" \ 1429 1412 -e "s/ 1430 1413 //" \ 1431 -e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \ 1432 -e "s:^program_suffix[ ]*=.*$:program_suffix = ${program_suffix}:" \ 1433 -e "s:^program_transform_name[ ]*=.*$:program_transform_name = ${program_transform_name}:" \ 1434 -e "s|^tooldir[ ]*=.*$|tooldir = ${tooldir}|" \ 1435 -e "s|^build_tooldir[ ]*=.*$|build_tooldir = ${tooldir}|" \ 1436 -e "s:^DEFAULT_YACC[ ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \ 1437 -e "s:^DEFAULT_LEX[ ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \ 1438 -e "s:^DEFAULT_M4[ ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \ 1414 -e "s:@program_transform_name@:${program_transform_name}:" \ 1415 -e "s|@tooldir@|${tooldir}|" \ 1416 -e "s|@build_tooldir@|${tooldir}|" \ 1417 -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \ 1418 -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \ 1419 -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \ 1439 1420 ${subdir}/Makefile.tem >> ${Makefile} 1440 1421 1441 sed -e "s: ^GDB_TK[ ]*=.*$:GDB_TK =${GDB_TK}:" ${Makefile} >${Makefile}.tem1422 sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem 1442 1423 mv -f ${Makefile}.tem ${Makefile} 1443 1424 … … 1483 1464 newusing=`echo "${using}" | sed 's/and/using/'` 1484 1465 using=${newusing} 1485 echo "Created \"${Makefile}\" in" ${PWD=` pwd`} ${using}1466 echo "Created \"${Makefile}\" in" ${PWD=`${PWDCMD-pwd}`} ${using} 1486 1467 1487 1468 . ${tmpfile}.pos … … 1549 1530 true 1550 1531 else 1551 echo '***' "${progname}: could not make ${PWD=` pwd`}/${bld_dir}" 1>&21532 echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${bld_dir}" 1>&2 1552 1533 exit 1 1553 1534 fi … … 1556 1537 esac 1557 1538 1558 POPDIR=${PWD=` pwd`}1539 POPDIR=${PWD=`${PWDCMD-pwd}`} 1559 1540 cd ${bld_dir} 1560 1541 … … 1604 1585 true 1605 1586 else 1606 echo Configure in ` pwd` failed, exiting. 1>&21587 echo Configure in `${PWDCMD-pwd}` failed, exiting. 1>&2 1607 1588 exit 1 1608 1589 fi -
Property cvs2svn:cvs-rev
changed from
Note:
See TracChangeset
for help on using the changeset viewer.
