From 0ce065bdf62acf72d74fcb8fc26185d22316fa63 Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Wed, 29 Jul 1998 23:13:57 +0000 Subject: [PATCH] configure: Fix --without/--disable cases for gxx-include-dir. 1998-07-29 Manfred Hollstein * configure: Fix --without/--disable cases for gxx-include-dir. From-SVN: r21486 --- ChangeLog | 4 ++++ configure | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52739ef8e9a9..0300df6350d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1998-07-29 Manfred Hollstein + + * configure: Fix --without/--disable cases for gxx-include-dir. + Sat Jul 18 14:32:43 CDT 1998 Robert Lipe * config.guess: (*-pc-sco3.2v5) Add detection for Pentium II. diff --git a/configure b/configure index af334067649a..99e35e9a3644 100755 --- 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. -- 2.43.5