diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-02 14:17:49 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-02 14:17:49 +0000 |
| commit | b7ba05c0794b6b46a876a7540b0fe112c9a9e756 (patch) | |
| tree | cbb6578d43ea22467a008e492c4f33e302b59ba8 /libio | |
| parent | de326e08b17279667441856172801ac487554156 (diff) | |
| download | gcc-b7ba05c0794b6b46a876a7540b0fe112c9a9e756.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26126 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ChangeLog | 5 | ||||
| -rw-r--r-- | libio/Makefile.in | 1 | ||||
| -rw-r--r-- | libio/configure.in | 29 |
3 files changed, 35 insertions, 0 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index d83539e5483..faeb9967ef3 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 2 15:11:58 1999 H.J. Lu (hjl@gnu.org) + + * libio/configure.in (gxx_include_dir): Handle it. + * libio/Makefile.in: Likewise. + Wed Mar 24 22:36:45 1999 Mumit Khan <khan@xraylith.wisc.edu> * configure.in (EXEEXT): Define. diff --git a/libio/Makefile.in b/libio/Makefile.in index 2ac472bceef..1d4123b523c 100644 --- a/libio/Makefile.in +++ b/libio/Makefile.in @@ -22,6 +22,7 @@ VERSION = 2.8.0 _G_CONFIG_H=_G_config.h tooldir = $(exec_prefix)/$(target) INSTALLDIR = $(libdir) +gxx_include_dir=${includedir}/g++ IO_OBJECTS = filedoalloc.o floatconv.o genops.o fileops.o \ iovfprintf.o \ diff --git a/libio/configure.in b/libio/configure.in index c5243bda235..85a00018c9f 100644 --- a/libio/configure.in +++ b/libio/configure.in @@ -178,3 +178,32 @@ 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 + topsrcdir=${srcdir}/.. . ${srcdir}/../config.if + 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 |