* gdbint.texinfo (CPLUS_MARKER): Remove item.

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 2cb059f6bf537c37a81815d8c4fa9d83d778bc57..ec9bebf5020d75a0affd77fb5117f039107f1ee3 100755 (executable)
--- a/configure
+++ b/configure
@@ -917,8 +917,8 @@ if [ "${build}" != "${host}" ]; then
 
   tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
   tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET"
-  tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
-  tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
+  tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET BUILD_PREFIX"
+  tools="${tools} BUILD_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
   tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
   tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
   tools="${tools} OBJCOPY OBJDUMP"
@@ -955,8 +955,8 @@ t loop
   DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
   DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
   GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
-  HOST_PREFIX=${build_alias}-
-  HOST_PREFIX_1=${build_alias}-
+  BUILD_PREFIX=${build_alias}-
+  BUILD_PREFIX_1=${build_alias}-
   LD=${LD-${host_alias}-ld}
   LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld}
   MAKEINFO=${MAKEINFO-makeinfo}
@@ -1356,8 +1356,7 @@ EOF
                 rm -f ${subdir}/Makefile.tm2
                 sedtemp=sed.$$
                 cat >$sedtemp <<EOF
-s:^SUBDIRS[    ]*=.*$:SUBDIRS = ${configdirs}:
-s:^NONSUBDIRS[         ]*=.*$:NONSUBDIRS = ${noconfigdirs}:
+s:@configdirs@:${configdirs}:
 EOF
                 sed -f $sedtemp \
                     ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
@@ -1365,21 +1364,21 @@ EOF
                 rm -f ${subdir}/Makefile.tem
                 mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem
            fi
-           sed     -e "s|^prefix[      ]*=.*$|prefix = ${prefix}|" \
-                    -e "s|^exec_prefix[        ]*=.*$|exec_prefix = ${exec_prefix}|" \
-                    -e "s|^bindir[     ]*=.*$|bindir = ${bindir}|" \
-                    -e "s|^sbindir[    ]*=.*$|sbindir = ${sbindir}|" \
-                    -e "s|^libexecdir[         ]*=.*$|libexecdir = ${libexecdir}|" \
-                    -e "s|^datadir[    ]*=.*$|datadir = ${datadir}|" \
-                    -e "s|^sysconfdir[         ]*=.*$|sysconfdir = ${sysconfdir}|" \
-                    -e "s|^sharedstatedir[     ]*=.*$|sharedstatedir = ${sharedstatedir}|" \
-                    -e "s|^localstatedir[      ]*=.*$|localstatedir = ${localstatedir}|" \
-                    -e "s|^libdir[     ]*=.*$|libdir = ${libdir}|" \
-                    -e "s|^includedir[         ]*=.*$|includedir = ${includedir}|" \
-                    -e "s|^oldincludedir[      ]*=.*$|oldincludedir = ${oldincludedir}|" \
-                    -e "s|^infodir[    ]*=.*$|infodir = ${infodir}|" \
-                    -e "s|^mandir[     ]*=.*$|mandir = ${mandir}|" \
-                   -e "s|^ALL_BUILD_MODULES =.*|ALL_BUILD_MODULES =${all_build_modules}|" \
+           sed     -e "s|@prefix@|${prefix}|" \
+                    -e "s|@exec_prefix@|${exec_prefix}|" \
+                    -e "s|@bindir@|${bindir}|" \
+                    -e "s|@sbindir@|${sbindir}|" \
+                    -e "s|@libexecdir@|${libexecdir}|" \
+                    -e "s|@datadir@|${datadir}|" \
+                    -e "s|@sysconfdir@|${sysconfdir}|" \
+                    -e "s|@sharedstatedir@|${sharedstatedir}|" \
+                    -e "s|@localstatedir@|${localstatedir}|" \
+                    -e "s|@libdir@|${libdir}|" \
+                    -e "s|@includedir@|${includedir}|" \
+                    -e "s|@oldincludedir@|${oldincludedir}|" \
+                    -e "s|@infodir@|${infodir}|" \
+                    -e "s|@mandir@|${mandir}|" \
+                   -e "s|@all_build_modules@|${all_build_modules}|" \
                    -e "/^CC[   ]*=/{
                        :loop1
                        /\\\\$/ N
@@ -1408,20 +1407,18 @@ EOF
                        t loop4
                        s%^CXXFLAGS[    ]*=.*$%CXXFLAGS = ${CXXFLAGS}%
                        }" \
-                   -e "s|^SHELL[        ]*=.*$|SHELL = ${config_shell}|" \
-                    -e "s|^srcdir[     ]*=.*$|srcdir = ${makesrcdir}|" \
+                   -e "s|@config_shell@|${config_shell}|" \
+                    -e "s|@srcdir@|${makesrcdir}|" \
                     -e "s/\f//" \
-                    -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
-                    -e "s:^program_suffix[     ]*=.*$:program_suffix = ${program_suffix}:" \
-                    -e "s:^program_transform_name[     ]*=.*$:program_transform_name = ${program_transform_name}:" \
-                    -e "s|^tooldir[    ]*=.*$|tooldir = ${tooldir}|" \
-                    -e "s|^build_tooldir[      ]*=.*$|build_tooldir = ${tooldir}|" \
-                   -e "s:^DEFAULT_YACC[         ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \
-                   -e "s:^DEFAULT_LEX[  ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \
-                   -e "s:^DEFAULT_M4[  ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \
+                    -e "s:@program_transform_name@:${program_transform_name}:" \
+                    -e "s|@tooldir@|${tooldir}|" \
+                    -e "s|@build_tooldir@|${tooldir}|" \
+                   -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \
+                   -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \
+                   -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \
                     ${subdir}/Makefile.tem >> ${Makefile}
   
-           sed -e "s:^GDB_TK[   ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem
+           sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem
            mv -f ${Makefile}.tem ${Makefile}
 
            # If this is a Canadian Cross, preset the values of many more