This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

New PATCH to toplevel configure (was: Re: Patch to configure.in )


On Wed, 29 July 1998, 00:50:58, law@hurl.cygnus.com wrote:

 > 
 >   In message <13757.35411.776751.410883@slsvhmt>you write:
 >   > As gxx-include-dir is used e.g. in the libstdc++ and libio directories 
 >   > as well, I suggest moving the check to the toplevel configure script
 >   > or to add a check there, too. Perhaps we should also add relative path
 >   > names as "bad values".
 > Agreed on adding a check to the toplevel for gxx-include-dir.  Can
 > you submit a patch for that?

Here is the patch.

manfred


1998-07-29  Manfred Hollstein  <manfred@s-direktnet.de>

	* configure: Fix --without/--disable cases for gxx-include-dir.

Index: egcs/configure
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/configure,v
retrieving revision 1.17
diff -u -p -r1.17 configure
--- egcs/configure	1998/06/26 02:13:37	1.17
+++ egcs/configure	1998/07/29 08:35:20
@@ -1240,14 +1240,29 @@ EOF
 	    # provide a proper gxx_include_dir to all subdirs.
 	    # Note, if you change the default, make sure to fix both here
 	    # and in the gcc subdirectory.
-	    if test -z "${with_gxx_include_dir}"; then
+	    # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
+	    gxx_include_dir=
+	    if test -n "${with_gxx_include_dir}"; then
+		case "${with_gxx_include_dir}" in
+		  yes )
+		    echo "configure: error: bad value ${withval} given for g++ include directory" 1>&2
+		    exit 1
+		    ;;
+		  no )
+		    ;;
+		  * )
+		    gxx_include_dir=${with_gxx_include_dir}
+		    ;;
+		esac
+	    fi
+	    if test x${gxx_include_dir} = x; then
 	        if test x${enable_version_specific_runtime_libs} = xyes; then
 		    echo gxx_include_dir = '${libsubdir}/include/g++' >> ${Makefile}
 		else
 		    echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
 		fi
 	    else
-		echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile}
+		echo gxx_include_dir = ${gxx_include_dir} >> ${Makefile}
 	    fi
 
 	    # record if we want to build shared libs.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]