acinclude.m4 (GLIBCPP_ENABLE_CHEADERS): Use glibcpp_srcdir when setting C_INCLUDE_DIR.

2001-07-16  Stephen M. Webb  <stephen@bregmasoft.com>

	* acinclude.m4 (GLIBCPP_ENABLE_CHEADERS):  Use glibcpp_srcdir when
	setting C_INCLUDE_DIR.
	* configure.in:  Revert yesterday's LN_S change.
	* aclocal.m4:  Regenerate.
	* configure:  Regenerate.

From-SVN: r44052
This commit is contained in:
Stephen M. Webb 2001-07-16 17:43:54 +00:00 committed by Phil Edwards
parent 3d719162d0
commit fb124b992c
5 changed files with 19 additions and 11 deletions

View file

@ -1,3 +1,11 @@
2001-07-16 Stephen M. Webb <stephen@bregmasoft.com>
* acinclude.m4 (GLIBCPP_ENABLE_CHEADERS): Use glibcpp_srcdir when
setting C_INCLUDE_DIR.
* configure.in: Revert yesterday's LN_S change.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2001-07-15 Phil Edwards <pme@sources.redhat.com>
* configure.in: Temporarily force LN_S to copy instead of symlink.

View file

@ -1437,16 +1437,16 @@ changequote([, ])
case "$enable_cheaders" in
c_shadow)
CSHADOW_FLAGS="-fno-builtin"
C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
;;
c_std)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c_std'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
;;
c)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
;;
esac

View file

@ -1449,16 +1449,16 @@ changequote([, ])
case "$enable_cheaders" in
c_shadow)
CSHADOW_FLAGS="-fno-builtin"
C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
;;
c_std)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c_std'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
;;
c)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
;;
esac

View file

@ -721,7 +721,7 @@ target_alias=${target_alias-$target}
# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also
# be 'cp -p' if linking isn't available.
ac_cv_prog_LN_S='cp -p'
#ac_cv_prog_LN_S='cp -p'
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:727: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
@ -3614,7 +3614,7 @@ fi
case "$enable_cheaders" in
c_shadow)
CSHADOW_FLAGS="-fno-builtin"
C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
cat >> confdefs.h <<\EOF
#define _GLIBCPP_USE_SHADOW_HEADERS 1
EOF
@ -3622,11 +3622,11 @@ EOF
;;
c_std)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c_std'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
;;
c)
CSHADOW_FLAGS=""
C_INCLUDE_DIR='${top_srcdir}/include/c'
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
;;
esac

View file

@ -38,7 +38,7 @@ AC_SUBST(target_alias)
# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also
# be 'cp -p' if linking isn't available.
ac_cv_prog_LN_S='cp -p'
#ac_cv_prog_LN_S='cp -p'
AC_PROG_LN_S
# We use these options to decide which functions to include.