* config/sh/sh.c (gen_shl_and): Revert previous patch.

[pf3gnuchains/gcc-fork.git] / configure

diff --git a/configure b/configure
index dafba31..d055bd8 100755 (executable)
--- a/configure
+++ b/configure
@@ -89,7 +89,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.44 $"
+version="$Revision: 1.48 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -573,33 +573,6 @@ case "${srcdir}" in
        fi
 esac
 
-# If it's an in-source build, make a directory and configure there instead.
-# Name the build directory after the host for clarity's sake.  Remember that
-# name for the redirecting makefile's use, since the makefile shouldn't have
-# to duplicate the work of figuring out host_alias.
-#
-# Also remember if this is a native build or not.  Variations on "or not"
-# are performed later in this script so we can't test them here.  In
-# particular, build_alias will still be empty unless specified by the user,
-# so do not try in-source builds when making a host-x-host compiler.
-# For a cross compile, "make all" = "all".  Otherwise, "all" = "bootstrap".
-if test "${srcdir}" = "." ; then
-       builddir=${host_alias}
-       if test ! -d ${builddir}; then
-               mkdir ${builddir} || exit 1
-       fi
-       if test ${host_alias} != ${target_alias}; then
-               t=all
-       else
-               t=bootstrap
-       fi
-       # stamp-builddir is too long for #$&!*@ 8.3 filesystems
-       echo "builddir=${builddir}" > s-buildd
-       echo "defaulttarget=$t" >> s-buildd
-       cd ${builddir}
-       exec ${config_shell} ../configure $arguments
-fi
-
 ### warn about some conflicting configurations.
 
 case "${srcdir}" in
@@ -1383,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
@@ -1392,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
@@ -1435,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