configure.in: Change GLIBCPP_ENABLE_SHADOW to GLIBCPP_ENABLE_CHEADERS.

2000-12-21 Benjamin Kosnik <bkoz@redhat.com> * configure.in: Change GLIBCPP_ENABLE_SHADOW to GLIBCPP_ENABLE_CHEADERS. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to ENABLE_CHEADERS. C_INCLUDE_DIR defaults to c_std from c. * aclocal.m4: Regenerate. * configure: Regenerate. * include/c: Move to ... * include/c_std: ...here. * include/c_std: Move to ... * include/c_shadow: ...here. * include/c: Repopulate, with simple headers. * docs/html/configopts.html: Adjust docs. From-SVN: r38432

configure.in: Change GLIBCPP_ENABLE_SHADOW to GLIBCPP_ENABLE_CHEADERS.
2000-12-21 Benjamin Kosnik <bkoz@redhat.com> * configure.in: Change GLIBCPP_ENABLE_SHADOW to GLIBCPP_ENABLE_CHEADERS. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to ENABLE_CHEADERS. C_INCLUDE_DIR defaults to c_std from c. * aclocal.m4: Regenerate. * configure: Regenerate. * include/c: Move to ... * include/c_std: ...here. * include/c_std: Move to ... * include/c_shadow: ...here. * include/c: Repopulate, with simple headers. * docs/html/configopts.html: Adjust docs. From-SVN: r38432
e3123ab3 · Benjamin Kosnik · Benjamin Kosnik · 3546ef58 · e3123ab3 · e3123ab3
Commit e3123ab3 authored Dec 21, 2000 by Benjamin Kosnik Committed by Benjamin Kosnik Dec 21, 2000
9 changed files
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+2000-12-21  Benjamin Kosnik  <bkoz@redhat.com>
+	* configure.in: Change GLIBCPP_ENABLE_SHADOW to
+	GLIBCPP_ENABLE_CHEADERS.
+	* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to
+	ENABLE_CHEADERS.  C_INCLUDE_DIR defaults to c_std from c. 
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* include/c: Move to ...
+	* include/c_std: ...here.
+	* include/c_std: Move to ...
+	* include/c_shadow: ...here.
+	* include/c: Repopulate, with simple headers.
+	* docs/html/configopts.html: Adjust docs.
 2000-12-21  Joseph S. Myers  <jsm28@cam.ac.uk>
 	* acinclude.m4, configure.in, mkcheck.in,

--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1492,43 +1492,51 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 dnl
-dnl Check for whether or not to do shadowed C headers.
+dnl Check for what kind of C headers to use.
 dnl
-dnl GLIBCPP_ENABLE_SHADOW
+dnl GLIBCPP_ENABLE_CHEADERS
-dnl --enable-cshadow-headers [does stuff].
+dnl --enable-cheaders= [does stuff].
-dnl --disable-cshadow-headers [does not do stuff].
+dnl --disable-cheaders [does not do anything, really].
-dnl  +  This will eventually need to be on by default.
+dnl  +  This will eventually need to be 'c_shadow' by default.
-dnl  +  Usage:  GLIBCPP_ENABLE_SHADOW[(DEFAULT)]
+dnl  +  Usage:  GLIBCPP_ENABLE_CHEADERS[(DEFAULT)]
-dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
+dnl       Where DEFAULT is either `c' or `c_std' or 'c_shadow'.  
-dnl       defaults to `no'.
+dnl       If ommitted, it defaults to `c_std'.
-AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl
+AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl
-define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl
+define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
-AC_MSG_CHECKING([for enabled cshadow headers])
+AC_MSG_CHECKING([for c header strategy to use])
-AC_ARG_ENABLE(cshadow-headers,
+AC_ARG_ENABLE(cheaders,
 changequote(<<, >>)dnl
-<<  --enable-cshadow-headers construct "shadowed" C header files for
+<<  --enable-cheaders construct "C" header files for
-                           g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT],
+                           g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
 changequote([, ])
  [case "$enableval" in
-   yes) enable_cshadow_headers=yes 
+   c) 
+	enable_cheaders=c 
        ;;
-   no)  enable_cshadow_headers=no 
+   c_std)  
+	enable_cheaders=c_std 
        ;;
-   *)   AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) 
+   c_shadow)  
+	enable_cheaders=c_shadow 
+        ;;
+   *)   AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) 
        ;;
  esac],
-  enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)
+  enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
-  AC_MSG_RESULT($enable_cshadow_headers)
+  AC_MSG_RESULT($enable_cheaders)
  dnl Option parsed, now set things appropriately
-  dnl NB: these things may be duplicated in c++config.h as well.
+  case "$enable_cheaders" in
-  case "$enable_cshadow_headers" in
+    c_shadow) 
-    yes) 
        CSHADOW_FLAGS="-fno-builtin"
-        C_INCLUDE_DIR='${top_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
        AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
        ;;
-    no)   
+    c_std)   
+        CSHADOW_FLAGS=""
+        C_INCLUDE_DIR='${top_srcdir}/include/c_std'
+        ;;
+    c)   
        CSHADOW_FLAGS=""
        C_INCLUDE_DIR='${top_srcdir}/include/c'
        ;;
@@ -1536,7 +1544,7 @@ changequote([, ])
  AC_SUBST(CSHADOW_FLAGS)
  AC_SUBST(C_INCLUDE_DIR)
-  AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
+  AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cheaders" = c_shadow)
 ])
@@ -1584,7 +1592,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
  # Can either use include/c or include/c_std to grab "C" headers. This
  # variable is set to the include directory currently in use.
-  # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW
+  # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_CHEADERS
  # Passed down for canadian crosses.
  if  test x"$CANADIAN" = xyes; then

--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1504,43 +1504,51 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 dnl
-dnl Check for whether or not to do shadowed C headers.
+dnl Check for what kind of C headers to use.
 dnl
-dnl GLIBCPP_ENABLE_SHADOW
+dnl GLIBCPP_ENABLE_CHEADERS
-dnl --enable-cshadow-headers [does stuff].
+dnl --enable-cheaders= [does stuff].
-dnl --disable-cshadow-headers [does not do stuff].
+dnl --disable-cheaders [does not do anything, really].
-dnl  +  This will eventually need to be on by default.
+dnl  +  This will eventually need to be 'c_shadow' by default.
-dnl  +  Usage:  GLIBCPP_ENABLE_SHADOW[(DEFAULT)]
+dnl  +  Usage:  GLIBCPP_ENABLE_CHEADERS[(DEFAULT)]
-dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
+dnl       Where DEFAULT is either `c' or `c_std' or 'c_shadow'.  
-dnl       defaults to `no'.
+dnl       If ommitted, it defaults to `c_std'.
-AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl
+AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl
-define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl
+define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
-AC_MSG_CHECKING([for enabled cshadow headers])
+AC_MSG_CHECKING([for c header strategy to use])
-AC_ARG_ENABLE(cshadow-headers,
+AC_ARG_ENABLE(cheaders,
 changequote(<<, >>)dnl
-<<  --enable-cshadow-headers construct "shadowed" C header files for
+<<  --enable-cheaders construct "C" header files for
-                           g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT],
+                           g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
 changequote([, ])
  [case "$enableval" in
-   yes) enable_cshadow_headers=yes 
+   c) 
+	enable_cheaders=c 
        ;;
-   no)  enable_cshadow_headers=no 
+   c_std)  
+	enable_cheaders=c_std 
        ;;
-   *)   AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) 
+   c_shadow)  
+	enable_cheaders=c_shadow 
+        ;;
+   *)   AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) 
        ;;
  esac],
-  enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)
+  enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
-  AC_MSG_RESULT($enable_cshadow_headers)
+  AC_MSG_RESULT($enable_cheaders)
  dnl Option parsed, now set things appropriately
-  dnl NB: these things may be duplicated in c++config.h as well.
+  case "$enable_cheaders" in
-  case "$enable_cshadow_headers" in
+    c_shadow) 
-    yes) 
        CSHADOW_FLAGS="-fno-builtin"
-        C_INCLUDE_DIR='${top_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
        AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
        ;;
-    no)   
+    c_std)   
+        CSHADOW_FLAGS=""
+        C_INCLUDE_DIR='${top_srcdir}/include/c_std'
+        ;;
+    c)   
        CSHADOW_FLAGS=""
        C_INCLUDE_DIR='${top_srcdir}/include/c'
        ;;
@@ -1548,7 +1556,7 @@ changequote([, ])
  AC_SUBST(CSHADOW_FLAGS)
  AC_SUBST(C_INCLUDE_DIR)
-  AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
+  AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cheaders" = c_shadow)
 ])
@@ -1596,7 +1604,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
  # Can either use include/c or include/c_std to grab "C" headers. This
  # variable is set to the include directory currently in use.
-  # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW
+  # set with C_INCLUDE_DIR in GLIBCPP_ENABLE_CHEADERS
  # Passed down for canadian crosses.
  if  test x"$CANADIAN" = xyes; then

--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -300,15 +300,6 @@
 /* Define if you have the cosl function.  */
 #undef HAVE_COSL
-/* Define if you have the csqrt function.  */
-#undef HAVE_CSQRT
-/* Define if you have the csqrtf function.  */
-#undef HAVE_CSQRTF
-/* Define if you have the csqrtl function.  */
-#undef HAVE_CSQRTL
 /* Define if you have the expf function.  */
 #undef HAVE_EXPF
@@ -501,9 +492,6 @@
 /* Define if you have the wmemset function.  */
 #undef HAVE_WMEMSET
-/* Define if you have the <complex.h> header file.  */
-#undef HAVE_COMPLEX_H
 /* Define if you have the <endian.h> header file.  */
 #undef HAVE_ENDIAN_H

--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -37,7 +37,7 @@ GLIBCPP_ENABLE_DEBUG($USE_MAINTAINER_MODE)
 GLIBCPP_ENABLE_CSTDIO
 GLIBCPP_ENABLE_C_MBCHAR([yes])
 GLIBCPP_ENABLE_LONG_LONG([no])
-GLIBCPP_ENABLE_SHADOW([no])
+GLIBCPP_ENABLE_CHEADERS([c_std])
 GLIBCPP_ENABLE_THREADS
 GLIBCPP_ENABLE_ATOMICITY
 GLIBCPP_ENABLE_CXX_FLAGS([none])

--- a/libstdc++-v3/docs/html/configopts.html
+++ b/libstdc++-v3/docs/html/configopts.html
@@ -7,7 +7,7 @@
   <META NAME="GENERATOR" CONTENT="vi and eight fingers">
   <TITLE>libstdc++-v3 configure options</TITLE>
 <LINK REL=StyleSheet HREF="lib3styles.css">
-<!-- $Id: configopts.html,v 1.18 2000/12/03 23:47:46 jsm28 Exp $ -->
+<!-- $Id: configopts.html,v 1.1 2000/12/10 04:03:08 pme Exp $ -->
 </HEAD>
 <BODY>
@@ -75,10 +75,12 @@ options</A></H1>
        templates and the like).
     </P>
- <DT><TT>--enable-cshadow-headers  </TT>
+ <DT><TT>--enable-cheaders=OPTION  </TT>
- <DD><P>This turns on the code to construct shadowed C headers, and to
+ <DD><P>This allows the user to define what kind of C headers are
-        use c headers in the std:: namespace.  Very experimental as of
+	used.  Options are: c, c_std, and c_shadow. These correspond
-        this writing.
+	to the source directory's include/c, include/c_std, and
+	include/c_shadow directories.
+ 	The default is c_std.
     </P>
 <DT><TT>--enable-threads  </TT>
@@ -167,7 +169,7 @@ options</A></H1>
 <HR>
 <P CLASS="fineprint"><EM>
-$Id: configopts.html,v 1.18 2000/12/03 23:47:46 jsm28 Exp $
+$Id: configopts.html,v 1.1 2000/12/10 04:03:08 pme Exp $
 </EM></P>

--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -111,7 +111,7 @@ libio_la = @libio_la@
 libstdcxx_interface = @libstdcxx_interface@
 AUTOMAKE_OPTIONS = 1.3 cygnus
-@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la
+@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
 @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -123,21 +123,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
-INCLUDES = \
+INCLUDES =  	-nostdinc++ 	-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) 	$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)	
-	-nostdinc++ \
-	-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
-	$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)	
-libio_headers = \
+libio_headers =          libio.h libioP.h iolibio.h
-        libio.h libioP.h iolibio.h
-@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = 	filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c     iofopen.c stdio.c
-@GLIBCPP_NEED_LIBIO_TRUE@	filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c \
-@GLIBCPP_NEED_LIBIO_TRUE@    iofopen.c stdio.c
 @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = 
-@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\
+@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = 	wfiledoalloc.c wfileops.c wgenops.c iofwide.c
-@GLIBCPP_NEED_WLIBIO_TRUE@	wfiledoalloc.c wfileops.c wgenops.c iofwide.c
 @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = 
 EXTRA_DIST = iostreamP.h

--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -112,12 +112,12 @@ MAINT_CHARSET = latin1
 # Cross compiler and multilib support.
 # Install a library built with a cross compiler in tooldir, not libdir.
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@@gcc_version@
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
-@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(toolexecdir)/$(gcc_version)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
-@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
@@ -133,13 +133,11 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
-CONFIG_CXXFLAGS = \
+CONFIG_CXXFLAGS =  	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
-	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
 # Warning flags to use.
-WARN_CXXFLAGS = \
+WARN_CXXFLAGS =  	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
-	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -151,38 +149,20 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
-INCLUDES = \
+INCLUDES =  	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include 	$(CSHADOW_INCLUDES)  $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) 	$(CONFIG_INCLUDES) -I$(top_builddir)/include
-	-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
-	$(CSHADOW_INCLUDES)  $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
-	$(CONFIG_INCLUDES) -I$(top_builddir)/include
-headers = \
+headers =  	cxxabi.h exception new typeinfo
-	cxxabi.h exception new typeinfo
-sources = \
+sources =  	del_op.cc 	del_opnt.cc 	del_opv.cc 	del_opvnt.cc 	exception_support.cc 	new_handler.cc 	new_op.cc 	new_opnt.cc 	new_opv.cc 	new_opvnt.cc 	pure.cc 	tinfo.cc 	tinfo2.cc 	vec.cc
-	del_op.cc \
-	del_opnt.cc \
-	del_opv.cc \
-	del_opvnt.cc \
-	exception_support.cc \
-	new_handler.cc \
-	new_op.cc \
-	new_opnt.cc \
-	new_opv.cc \
-	new_opvnt.cc \
-	pure.cc \
-	tinfo.cc \
-	tinfo2.cc \
-	vec.cc
 libsupc___la_SOURCES = $(sources)
 libsupc__convenience_la_SOURCES = $(sources)
-@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
+@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@
-@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
-@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
 glibcppinstall_HEADERS = $(headers)
@@ -195,12 +175,7 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-AM_CXXFLAGS = \
+AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
-	-fno-implicit-templates \
-	$(LIBSUPCXX_CXXFLAGS) \
-	$(WARN_CXXFLAGS) \
-	$(OPTIMIZE_CXXFLAGS) \
-	$(CONFIG_CXXFLAGS) 
 # libstdc++ libtool notes
@@ -221,16 +196,14 @@ AM_CXXFLAGS = \
 # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
 # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
 # attempt to infer which configuration to use
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
-	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
 # 3) We have a problem when building the shared libstdc++ object if
 # the rules automake generates would be used.  We cannot allow CXX to
 # be used in libtool since this would add -lstdc++ to the link line
 # which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
-	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h