acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): New conditional, GLIBCPP_BUILD_LIBIO, true…

acinclude.m4 (GLIBCPP_ENABLE_CSTDIO): New conditional, GLIBCPP_BUILD_LIBIO, true iff building libio.

2000-12-08  Phil Edwards  <pme@sources.redhat.com>

	* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO):  New conditional,
	  GLIBCPP_BUILD_LIBIO, true iff building libio.
	* libio/Makefile.am:  Use; set noinst_LTLIBRARIES empty if false.
	* aclocal.m4:  Regenerated.
	* config.h.in:  Regenerated.
	* configure:  Regenerated.
	* libio/Makefile.in:  Regenerated.
	* libmath/Makefile.in:  Regenerated.

From-SVN: r38138

libstdc++-v3/ChangeLog

+2000-12-08  Phil Edwards  <pme@sources.redhat.com>
+
+	* acinclude.m4 (GLIBCPP_ENABLE_CSTDIO):  New conditional,
+	  GLIBCPP_BUILD_LIBIO, true iff building libio.
+	* libio/Makefile.am:  Use; set noinst_LTLIBRARIES empty if false.
+	* aclocal.m4:  Regenerated.
+	* config.h.in:  Regenerated.
+	* configure:  Regenerated.
+	* libio/Makefile.in:  Regenerated.
+	* libmath/Makefile.in:  Regenerated.
+
 2000-12-08  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* libmath/Makefile.am (EXTRA_LONG_DOUBLE_yes): Remove ccosl,

libstdc++-v3/acinclude.m4

@@ -1344,6 +1344,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
   AC_LINK_FILES($CCODECVT_C, libio/c_codecvt.c)
   # 2000-08-04 bkoz hack
 
+  AM_CONDITIONAL(GLIBCPP_BUILD_LIBIO,
+                 test "$need_libio" = yes || test "$need_wlibio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
   if test "$need_libio" = yes || test "$need_wlibio" = yes; then

libstdc++-v3/aclocal.m4

@@ -1356,6 +1356,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
   AC_LINK_FILES($CCODECVT_C, libio/c_codecvt.c)
   # 2000-08-04 bkoz hack
 
+  AM_CONDITIONAL(GLIBCPP_BUILD_LIBIO,
+                 test "$need_libio" = yes || test "$need_wlibio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
   if test "$need_libio" = yes || test "$need_wlibio" = yes; then

libstdc++-v3/config.h.in

@@ -279,42 +279,12 @@
 /* Define if you have the atanl function.  */
 #undef HAVE_ATANL
 
-/* Define if you have the ccos function.  */
-#undef HAVE_CCOS
-
-/* Define if you have the ccosf function.  */
-#undef HAVE_CCOSF
-
-/* Define if you have the ccosh function.  */
-#undef HAVE_CCOSH
-
-/* Define if you have the ccoshf function.  */
-#undef HAVE_CCOSHF
-
-/* Define if you have the ccoshl function.  */
-#undef HAVE_CCOSHL
-
-/* Define if you have the ccosl function.  */
-#undef HAVE_CCOSL
-
 /* Define if you have the ceilf function.  */
 #undef HAVE_CEILF
 
 /* Define if you have the ceill function.  */
 #undef HAVE_CEILL
 
-/* Define if you have the cexp function.  */
-#undef HAVE_CEXP
-
-/* Define if you have the cexpf function.  */
-#undef HAVE_CEXPF
-
-/* Define if you have the cexpl function.  */
-#undef HAVE_CEXPL
-
-/* Define if you have the clog10l function.  */
-#undef HAVE_CLOG10L
-
 /* Define if you have the copysign function.  */
 #undef HAVE_COPYSIGN
 
@@ -336,27 +306,6 @@
 /* Define if you have the cosl function.  */
 #undef HAVE_COSL
 
-/* Define if you have the cpowl function.  */
-#undef HAVE_CPOWL
-
-/* Define if you have the csin function.  */
-#undef HAVE_CSIN
-
-/* Define if you have the csinf function.  */
-#undef HAVE_CSINF
-
-/* Define if you have the csinh function.  */
-#undef HAVE_CSINH
-
-/* Define if you have the csinhf function.  */
-#undef HAVE_CSINHF
-
-/* Define if you have the csinhl function.  */
-#undef HAVE_CSINHL
-
-/* Define if you have the csinl function.  */
-#undef HAVE_CSINL
-
 /* Define if you have the csqrt function.  */
 #undef HAVE_CSQRT
 
@@ -366,24 +315,6 @@
 /* Define if you have the csqrtl function.  */
 #undef HAVE_CSQRTL
 
-/* Define if you have the ctan function.  */
-#undef HAVE_CTAN
-
-/* Define if you have the ctanf function.  */
-#undef HAVE_CTANF
-
-/* Define if you have the ctanh function.  */
-#undef HAVE_CTANH
-
-/* Define if you have the ctanhf function.  */
-#undef HAVE_CTANHF
-
-/* Define if you have the ctanhl function.  */
-#undef HAVE_CTANHL
-
-/* Define if you have the ctanl function.  */
-#undef HAVE_CTANL
-
 /* Define if you have the expf function.  */
 #undef HAVE_EXPF
 

libstdc++-v3/libio/Makefile.am

@@ -23,7 +23,11 @@
 
 AUTOMAKE_OPTIONS = 1.3 cygnus
 
+if GLIBCPP_BUILD_LIBIO
 noinst_LTLIBRARIES = libio.la
+else
+noinst_LTLIBRARIES =
+endif
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@

libstdc++-v3/libio/Makefile.in

@@ -110,8 +110,8 @@ libio_la = @libio_la@
 libstdcxx_interface = @libstdcxx_interface@
 
 AUTOMAKE_OPTIONS = 1.3 cygnus
-
-noinst_LTLIBRARIES = libio.la
+@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la
+@GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = 
 
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@

libstdc++-v3/libmath/Makefile.in

@@ -113,18 +113,24 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
 
 noinst_LTLIBRARIES = libmath.la
 
-EXTRA_LONG_DOUBLE_yes =  	csqrtl.c hypotl.c signbitl.c
+EXTRA_LONG_DOUBLE_yes = \
+	csqrtl.c hypotl.c signbitl.c
 
 
-EXTRA_DIST =  	csqrt.c csqrtf.c hypot.c hypotf.c atan2f.c expf.c 	$(EXTRA_LONG_DOUBLE_yes) 
+EXTRA_DIST = \
+	csqrt.c csqrtf.c hypot.c hypotf.c atan2f.c expf.c \
+	$(EXTRA_LONG_DOUBLE_yes) 
 
 
-libmath_la_LIBADD =  	@LIBMATHOBJS@ 	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
+libmath_la_LIBADD = \
+	@LIBMATHOBJS@ \
+	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
 
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
-libmath_la_SOURCES =  	signbit.c signbitf.c
+libmath_la_SOURCES = \
+	signbit.c signbitf.c
 
 
 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -138,7 +144,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
 
-INCLUDES =  	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  	$(TOPLEVEL_INCLUDES) 
+INCLUDES = \
+	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  \
+	$(TOPLEVEL_INCLUDES) 
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h