diff options
| author | H.J. Lu <hjl@gnu.org> | 1999-04-02 14:17:49 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-04-02 07:17:49 -0700 |
| commit | 88101ab976e7d4f0df929ec525f6c576f7f22391 (patch) | |
| tree | cbb6578d43ea22467a008e492c4f33e302b59ba8 /libstdc++ | |
| parent | 09b893bba75609fa03a01600d46b001c288ba2f8 (diff) | |
| download | gcc-88101ab976e7d4f0df929ec525f6c576f7f22391.zip gcc-88101ab976e7d4f0df929ec525f6c576f7f22391.tar.gz gcc-88101ab976e7d4f0df929ec525f6c576f7f22391.tar.bz2 | |
configure (gxx_include_dir): Removed.
* configure (gxx_include_dir): Removed.
* configure.in (gxx_include_dir): Handle it.
* Makefile.in: Likewise.
* libio/configure.in (gxx_include_dir): Handle it.
* libio/Makefile.in: Likewise.
* libstdc++/configure.in (gxx_include_dir): Handle it.
* libstdc++/Makefile.in: Likewise.
From-SVN: r26126
Diffstat (limited to 'libstdc++')
| -rw-r--r-- | libstdc++/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++/configure.in | 28 |
3 files changed, 35 insertions, 0 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index ea3010d..658f5fd 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 2 15:12:14 1999 H.J. Lu (hjl@gnu.org) + + * libstdc++/configure.in (gxx_include_dir): Handle it. + * libstdc++/Makefile.in: Likewise. + Wed Mar 24 22:36:45 1999 Mumit Khan <khan@xraylith.wisc.edu> * configure.in (EXEEXT): Define. diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in index 903b38e..9e03d05 100644 --- a/libstdc++/Makefile.in +++ b/libstdc++/Makefile.in @@ -17,6 +17,8 @@ VERSION = 2.9.0 INTERFACE = 2 +gxx_include_dir=${includedir}/g++ + OBJS = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o SUBLIBS = $(STAMP)-string $(STAMP)-complx diff --git a/libstdc++/configure.in b/libstdc++/configure.in index 143f6ba..9590b6b 100644 --- a/libstdc++/configure.in +++ b/libstdc++/configure.in @@ -177,3 +177,31 @@ if [ -n "${with_cross_host}" ] ; then fi . ${topsrcdir}/config-ml.in + +gxx_include_dir= +# Specify the g++ header file directory +# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. +if test "${with_gxx_include_dir+set}" = set; then + withval="$with_gxx_include_dir" + case "${withval}" in + yes) + echo "configure.in: 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 + gxx_include_dir='${libsubdir}/include/g++' + else + gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface} + fi +fi + +rm -f Makefile.tem +sed -e "s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}%" \ + Makefile >Makefile.tem +mv -f Makefile.tem Makefile |