Commit d0d88ce3 by Benjamin Kosnik Committed by Benjamin Kosnik

acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to --enable-cshadow-headers.


2000-05-18  Benjamin Kosnik  <bkoz@gnu.org>

	* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to
	--enable-cshadow-headers. Add output messages.
	(GCC_ENABLE_LONG_LONG): Change to --enable-long-long, no
	underscores (like the rest of the enable options.) Add output messages.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r33980
parent ec9616c3
2000-05-18 Benjamin Kosnik <bkoz@gnu.org>
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to
--enable-cshadow-headers. Add output messages.
(GCC_ENABLE_LONG_LONG): Change to --enable-long-long, no
underscores (like the rest of the enable options.) Add output messages.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* configure.in: Touch.
2000-05-17 Benjamin Kosnik <bkoz@cygnus.com> 2000-05-17 Benjamin Kosnik <bkoz@cygnus.com>
* mkcheck.in: Enable shared library testing. * mkcheck.in: Enable shared library testing.
......
...@@ -910,9 +910,10 @@ dnl ...@@ -910,9 +910,10 @@ dnl
dnl GLIBCPP_ENABLE_LONG_LONG dnl GLIBCPP_ENABLE_LONG_LONG
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_MSG_CHECKING([for enabled long long])
AC_ARG_ENABLE(long-long, AC_ARG_ENABLE(long-long,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<<--enable-long_long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "$enableval" in [case "$enableval" in
yes) enable_long_long=yes ;; yes) enable_long_long=yes ;;
...@@ -920,6 +921,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl ...@@ -920,6 +921,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
*) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;; *) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;;
esac], esac],
enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl
AC_MSG_RESULT($enable_long_long)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_long_long" in case "$enable_long_long" in
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
...@@ -932,29 +934,35 @@ dnl ...@@ -932,29 +934,35 @@ dnl
dnl Check for certain special build configurations. dnl Check for certain special build configurations.
dnl dnl
dnl GLIBCPP_ENABLE_SHADOW dnl GLIBCPP_ENABLE_SHADOW
dnl --enable-shadow-headers [does stuff]. dnl --enable-cshadow-headers [does stuff].
dnl --disable-shadow-headers [does not do stuff]. dnl --disable-cshadow-headers [does not do stuff].
dnl + This will eventually need to be on by default. dnl + This will eventually need to be on by default.
dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)] dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)]
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
dnl defaults to `no'. dnl defaults to `no'.
AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl
define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_ARG_ENABLE(shadow-headers, AC_MSG_CHECKING([for enabled cshadow headers])
AC_ARG_ENABLE(cshadow-headers,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-shadow-headers construct "shadowed" C header files for << --enable-cshadow-headers construct "shadowed" C header files for
g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "$enableval" in [case "$enableval" in
yes) enable_shadow_headers=yes ;; yes) enable_cshadow_headers=yes
no) enable_shadow_headers=no ;; ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) ;; no) enable_cshadow_headers=no
;;
*) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers])
;;
esac], esac],
enable_shadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl
AC_MSG_RESULT($enable_cshadow_headers)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_shadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
SHADOW_INCLUDES="-I -am -the -walrus" SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow"
$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow
;; ;;
no) no)
SHADOW_INCLUDES='' SHADOW_INCLUDES=''
......
...@@ -922,9 +922,10 @@ dnl ...@@ -922,9 +922,10 @@ dnl
dnl GLIBCPP_ENABLE_LONG_LONG dnl GLIBCPP_ENABLE_LONG_LONG
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_MSG_CHECKING([for enabled long long])
AC_ARG_ENABLE(long-long, AC_ARG_ENABLE(long-long,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<<--enable-long_long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "$enableval" in [case "$enableval" in
yes) enable_long_long=yes ;; yes) enable_long_long=yes ;;
...@@ -932,6 +933,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl ...@@ -932,6 +933,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
*) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;; *) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;;
esac], esac],
enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl
AC_MSG_RESULT($enable_long_long)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_long_long" in case "$enable_long_long" in
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
...@@ -944,29 +946,35 @@ dnl ...@@ -944,29 +946,35 @@ dnl
dnl Check for certain special build configurations. dnl Check for certain special build configurations.
dnl dnl
dnl GLIBCPP_ENABLE_SHADOW dnl GLIBCPP_ENABLE_SHADOW
dnl --enable-shadow-headers [does stuff]. dnl --enable-cshadow-headers [does stuff].
dnl --disable-shadow-headers [does not do stuff]. dnl --disable-cshadow-headers [does not do stuff].
dnl + This will eventually need to be on by default. dnl + This will eventually need to be on by default.
dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)] dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)]
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
dnl defaults to `no'. dnl defaults to `no'.
AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl
define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_ARG_ENABLE(shadow-headers, AC_MSG_CHECKING([for enabled cshadow headers])
AC_ARG_ENABLE(cshadow-headers,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-shadow-headers construct "shadowed" C header files for << --enable-cshadow-headers construct "shadowed" C header files for
g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "$enableval" in [case "$enableval" in
yes) enable_shadow_headers=yes ;; yes) enable_cshadow_headers=yes
no) enable_shadow_headers=no ;; ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) ;; no) enable_cshadow_headers=no
;;
*) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers])
;;
esac], esac],
enable_shadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl
AC_MSG_RESULT($enable_cshadow_headers)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_shadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
SHADOW_INCLUDES="-I -am -the -walrus" SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow"
$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow
;; ;;
no) no)
SHADOW_INCLUDES='' SHADOW_INCLUDES=''
......
...@@ -188,12 +188,3 @@ AC_OUTPUT_COMMANDS([cp $srcdir/config/$THREADH $blddir/bits/c++threads.h]) ...@@ -188,12 +188,3 @@ AC_OUTPUT_COMMANDS([cp $srcdir/config/$THREADH $blddir/bits/c++threads.h])
# Generate bits/c++io.h and src/c++io.cc # Generate bits/c++io.h and src/c++io.cc
AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_H $blddir/bits/c++io.h]) AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_H $blddir/bits/c++io.h])
AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_CC $blddir/src/c++io.cc]) AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_CC $blddir/src/c++io.cc])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment