diff --git a/ChangeLog b/ChangeLog index b820db5f9c9..ca4f48354d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-10-16 Matthias Klose + + * config.if: Search libstdc++-v3/configure.in for INTERFACE, + when configured for libstdc++-v3. + 2000-10-05 Phil Edwards * configure: Save configure arguments to gcc/configargs.h. diff --git a/config.if b/config.if index 625a4077ec0..31c8551d00f 100644 --- a/config.if +++ b/config.if @@ -23,15 +23,12 @@ fi if [ "${enable_libstdcxx_v3}" = "yes" ] ; then libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 + # We check libstdc++-v3/configure.in for libstdcxx_interface. + libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/configure.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` else libstdcxx_srcdir=${if_topsrcdir}/libstdc++ -fi - -if [ -f ${libstdcxx_srcdir}/Makefile.in ]; then -# We check libstdc++ for libstdcxx_interface. -libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -else -libstdcxx_interface= + # We check libstdc++/Makefile.in for libstdcxx_interface. + libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` fi if [ -f ${if_topsrcdir}/gcc/cp/Makefile.in ]; then