OSDN Git Service

1998-07-29 Manfred Hollstein <manfred@s-direktnet.de>
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 29 Jul 1998 23:13:57 +0000 (23:13 +0000)
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 29 Jul 1998 23:13:57 +0000 (23:13 +0000)
* configure: Fix --without/--disable cases for gxx-include-dir.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@21486 138bc75d-0d04-0410-961f-82ee72b054a4

ChangeLog
configure

index 52739ef..0300df6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-29  Manfred Hollstein  <manfred@s-direktnet.de>
+
+       * configure: Fix --without/--disable cases for gxx-include-dir.
+
 Sat Jul 18 14:32:43 CDT 1998  Robert Lipe  <robertl@dgii.com>
 
        * config.guess: (*-pc-sco3.2v5) Add detection for Pentium II.
index af33406..99e35e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.