mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-24 22:11:56 +08:00
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (INCLUDES): Added $(ZINCS). * configure: Rebuilt. * configure.in (ZINCS): New subst. From-SVN: r27083
This commit is contained in:
Tom Tromey
Tom Tromey
parent
7df879395a
commit
41e0e0cdbb
@ -1,3 +1,10 @@
|
||||
1999-05-21 Tom Tromey <tromey@cygnus.com>
|
||||
|
||||
* Makefile.in: Rebuilt.
|
||||
* Makefile.am (INCLUDES): Added $(ZINCS).
|
||||
* configure: Rebuilt.
|
||||
* configure.in (ZINCS): New subst.
|
||||
|
||||
1999-05-21 Andrew Haley <aph@cygnus.com>
|
||||
|
||||
* include/sparc-signal.h (INIT_FPE, INIT_SEGV): SA_NODEFER added
|
||||
|
||||
@ -71,7 +71,8 @@ endif
|
||||
JCFLAGS = -g
|
||||
JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
|
||||
|
||||
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) $(EH_COMMON_INCLUDE)
|
||||
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \
|
||||
$(EH_COMMON_INCLUDE) $(ZINCS)
|
||||
|
||||
|
||||
## ################################################################
|
||||
|
||||
@ -98,6 +98,7 @@ THREADSPEC = @THREADSPEC@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
ZDEPS = @ZDEPS@
|
||||
ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
here = @here@
|
||||
@ -152,7 +153,9 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ $(WARNINGS)
|
||||
JCFLAGS = -g
|
||||
JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
|
||||
|
||||
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) $(EH_COMMON_INCLUDE)
|
||||
INCLUDES = -Iinclude -I$(top_srcdir)/include $(GCINCS) $(THREADINCS) \
|
||||
$(EH_COMMON_INCLUDE) $(ZINCS)
|
||||
|
||||
|
||||
nat_files = $(nat_source_files:.cc=.lo)
|
||||
c_files = $(c_source_files:.c=.lo)
|
||||
|
||||
70
libjava/configure
vendored
70
libjava/configure
vendored
@ -4302,11 +4302,13 @@ fi
|
||||
|
||||
ZLIBS=
|
||||
ZDEPS=
|
||||
ZINCS=
|
||||
if test "x$ZLIBSPEC" = "x-lzgcj"; then
|
||||
# We include the path to the zlib build directory.
|
||||
# See Makefile.am to understand why.
|
||||
ZDEPS='$(top_builddir)/../zlib/libzgcj.la'
|
||||
ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
|
||||
ZINCS='-I$(top_srcdir)/../zlib'
|
||||
else
|
||||
ZLIBS="$ZLIBSPEC"
|
||||
fi
|
||||
@ -4315,6 +4317,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "$CANADIAN" = yes; then
|
||||
CANADIAN_TRUE=
|
||||
CANADIAN_FALSE='#'
|
||||
@ -4366,17 +4369,17 @@ for ac_hdr in unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sy
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4370: checking for $ac_hdr" >&5
|
||||
echo "configure:4373: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4375 "configure"
|
||||
#line 4378 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -4406,17 +4409,17 @@ for ac_hdr in dirent.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4410: checking for $ac_hdr" >&5
|
||||
echo "configure:4413: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4415 "configure"
|
||||
#line 4418 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -4444,16 +4447,16 @@ done
|
||||
|
||||
|
||||
echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
|
||||
echo "configure:4448: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
|
||||
echo "configure:4451: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4450 "configure"
|
||||
#line 4453 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <netinet/in.h>
|
||||
int main() {
|
||||
struct sockaddr_in6 addr6;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_INET6 1
|
||||
@ -4469,16 +4472,16 @@ fi
|
||||
rm -f conftest*
|
||||
|
||||
echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
|
||||
echo "configure:4473: checking for socklen_t in sys/socket.h" >&5
|
||||
echo "configure:4476: checking for socklen_t in sys/socket.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4475 "configure"
|
||||
#line 4478 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/socket.h>
|
||||
int main() {
|
||||
socklen_t x = 5;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_SOCKLEN_T 1
|
||||
@ -4494,16 +4497,16 @@ fi
|
||||
rm -f conftest*
|
||||
|
||||
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
|
||||
echo "configure:4498: checking for tm_gmtoff in struct tm" >&5
|
||||
echo "configure:4501: checking for tm_gmtoff in struct tm" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4500 "configure"
|
||||
#line 4503 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <time.h>
|
||||
int main() {
|
||||
struct tm tim; tim.tm_gmtoff = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define STRUCT_TM_HAS_GMTOFF 1
|
||||
@ -4516,16 +4519,16 @@ else
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
|
||||
echo "configure:4520: checking for global timezone variable" >&5
|
||||
echo "configure:4523: checking for global timezone variable" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4522 "configure"
|
||||
#line 4525 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <time.h>
|
||||
int main() {
|
||||
long z2 = timezone;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_TIMEZONE 1
|
||||
@ -4545,19 +4548,19 @@ rm -f conftest*
|
||||
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
||||
# for constant arguments. Useless!
|
||||
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
|
||||
echo "configure:4549: checking for working alloca.h" >&5
|
||||
echo "configure:4552: checking for working alloca.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4554 "configure"
|
||||
#line 4557 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_alloca_h=yes
|
||||
else
|
||||
@ -4578,12 +4581,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:4582: checking for alloca" >&5
|
||||
echo "configure:4585: checking for alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4587 "configure"
|
||||
#line 4590 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
@ -4611,7 +4614,7 @@ int main() {
|
||||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_alloca_works=yes
|
||||
else
|
||||
@ -4643,12 +4646,12 @@ EOF
|
||||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:4647: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:4650: checking whether alloca needs Cray hooks" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4652 "configure"
|
||||
#line 4655 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
@ -4673,12 +4676,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
|
||||
if test $ac_cv_os_cray = yes; then
|
||||
for ac_func in _getb67 GETB67 getb67; do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4677: checking for $ac_func" >&5
|
||||
echo "configure:4680: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4682 "configure"
|
||||
#line 4685 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -4701,7 +4704,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -4728,7 +4731,7 @@ done
|
||||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:4732: checking stack direction for C alloca" >&5
|
||||
echo "configure:4735: checking stack direction for C alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4736,7 +4739,7 @@ else
|
||||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4740 "configure"
|
||||
#line 4743 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
@ -4755,7 +4758,7 @@ main ()
|
||||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_stack_direction=1
|
||||
else
|
||||
@ -4782,7 +4785,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4786: checking for $ac_word" >&5
|
||||
echo "configure:4789: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -5034,6 +5037,7 @@ s%@USING_GCC_TRUE@%$USING_GCC_TRUE%g
|
||||
s%@USING_GCC_FALSE@%$USING_GCC_FALSE%g
|
||||
s%@ZLIBS@%$ZLIBS%g
|
||||
s%@ZDEPS@%$ZDEPS%g
|
||||
s%@ZINCS@%$ZINCS%g
|
||||
s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
|
||||
s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
|
||||
s%@NULL_TARGET_TRUE@%$NULL_TARGET_TRUE%g
|
||||
|
||||
@ -426,16 +426,19 @@ fi
|
||||
|
||||
ZLIBS=
|
||||
ZDEPS=
|
||||
ZINCS=
|
||||
if test "x$ZLIBSPEC" = "x-lzgcj"; then
|
||||
# We include the path to the zlib build directory.
|
||||
# See Makefile.am to understand why.
|
||||
ZDEPS='$(top_builddir)/../zlib/libzgcj.la'
|
||||
ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
|
||||
ZINCS='-I$(top_srcdir)/../zlib'
|
||||
else
|
||||
ZLIBS="$ZLIBSPEC"
|
||||
fi
|
||||
AC_SUBST(ZLIBS)
|
||||
AC_SUBST(ZDEPS)
|
||||
AC_SUBST(ZINCS)
|
||||
|
||||
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
|
||||
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
|
||||
|
||||
@ -100,6 +100,7 @@ THREADSPEC = @THREADSPEC@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
ZDEPS = @ZDEPS@
|
||||
ZINCS = @ZINCS@
|
||||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
here = @here@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user