riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

* configure: Regenerated. 

* aclocal.m4 (CY_AC_PATH_TCLH): Don't use AC_TRY_RUN.
        (CY_AC_PATH_TKH): Don't use AC_TRY_RUN.
gdb-4_18-branch
Tom Tromey 31 years ago
parent
076929515b
commit
e44d14910c
3 changed files with 165 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      gdb/ChangeLog
  2. 88
      gdb/aclocal.m4
  3. 232
      gdb/configure

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
Tue May 28 11:14:58 1996 Tom Tromey <tromey@creche.cygnus.com>
* configure: Regenerated.
* aclocal.m4 (CY_AC_PATH_TCLH): Don't use AC_TRY_RUN.
(CY_AC_PATH_TKH): Don't use AC_TRY_RUN.
Sun May 26 14:14:49 1996 Fred Fish <fnf@cygnus.com>
Changes from: David Mosberger-Tang <davidm@azstarnet.com>

88
gdb/aclocal.m4
View File

@ -119,35 +119,34 @@ if test x"${ac_cv_c_tclh}" != x ; then
fi
AC_MSG_CHECKING([Tcl version])
rm -rf tclmajor tclminor
orig_includes="$CPPFLAGS"
if test x"${TCLHDIR}" != x ; then
CPPFLAGS="$CPPFLAGS $TCLHDIR"
fi
AC_TRY_RUN([
#include <stdio.h>
# Get major and minor versions of Tcl.
cat > conftest.c <<'EOF'
#include "tcl.h"
main() {
FILE *maj = fopen("tclmajor","w");
FILE *min = fopen("tclminor","w");
fprintf(maj,"%d",TCL_MAJOR_VERSION);
fprintf(min,"%d",TCL_MINOR_VERSION);
fclose(maj);
fclose(min);
return 0;
}],
tclmajor=`cat tclmajor`
tclminor=`cat tclminor`
tclversion=$tclmajor.$tclminor
AC_MSG_RESULT($tclversion)
rm -f tclmajor tclminor
,
AC_MSG_RESULT([can't happen])
,
AC_MSG_ERROR([can't be cross compiled])
)
major = TCL_MAJOR_VERSION
minor = TCL_MINOR_VERSION
EOF
tclmajor=
tclminor=
if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
# Success.
tclmajor=`egrep '^major = ' conftest.out | sed -e 's/^major = *//' -e 's/ *$//'`
tclminor=`egrep '^minor = ' conftest.out | sed -e 's/^minor = *//' -e 's/ *$//'`
fi
rm -f conftest.c conftest.out
if test -z "$tclmajor" || test -z "$tclminor"; then
AC_MSG_RESULT([fatal error: could not find major or minor version number of Tcl])
exit 1
fi
AC_MSG_RESULT(${tclmajor}.${tclminor})
CPPFLAGS="${orig_includes}"
AC_PROVIDE([$0])
@ -378,7 +377,6 @@ fi
# if Tk is installed, extract the major/minor version
if test x"${no_tk}" = x ; then
AC_MSG_CHECKING([Tk version])
rm -rf tkmajor tkminor
orig_includes="$CPPFLAGS"
if test x"${TCLHDIR}" != x ; then
@ -391,30 +389,28 @@ if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then
CPPFLAGS="$CPPFLAGS -I$x_includes"
fi
AC_TRY_RUN([
#include <stdio.h>
# Get major and minor versions of Tk.
cat > conftest.c <<'EOF'
#include "tk.h"
main() {
FILE *maj = fopen("tkmajor","w");
FILE *min = fopen("tkminor","w");
fprintf(maj,"%d",TK_MAJOR_VERSION);
fprintf(min,"%d",TK_MINOR_VERSION);
fclose(maj);
fclose(min);
return 0;
}],
tkmajor=`cat tkmajor`
tkminor=`cat tkminor`
tkversion=$tkmajor.$tkminor
AC_MSG_RESULT($tkversion)
rm -f tkmajor tkminor
,
AC_MSG_ERROR([
cannot compile a simple X program - suspect your xmkmf is
misconfigured and is incorrectly reporting the location of your X
include or libraries - report this to your system admin]) ,
AC_MSG_ERROR([can't be cross compiled])
)
major = TK_MAJOR_VERSION
minor = TK_MINOR_VERSION
EOF
tkmajor=
tkminor=
if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
# Success.
tkmajor=`egrep '^major = ' conftest.out | sed -e 's/^major = *//' -e 's/ *$//'`
tkminor=`egrep '^minor = ' conftest.out | sed -e 's/^minor = *//' -e 's/ *$//'`
fi
rm -f conftest.c conftest.out
if test -z "$tkmajor" || test -z "$tkminor"; then
AC_MSG_RESULT([fatal error: could not find major or minor version number of Tk])
exit 1
fi
AC_MSG_RESULT(${tkmajor}.${tkminor})
CPPFLAGS="${orig_includes}"
fi

232
gdb/configure
View File

@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.8
# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
# Generated automatically using autoconf version 2.10
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@ -348,7 +348,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.8"
echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@ -1441,6 +1441,8 @@ else
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() { return 0; }
@ -1457,7 +1459,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@ -1485,7 +1487,7 @@ if eval "test \"`echo '$''{'gdb_cv_have_gregset_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1489 "configure"
#line 1491 "configure"
#include "confdefs.h"
#include <sys/procfs.h>
int main() { return 0; }
@ -1493,7 +1495,7 @@ int t() {
gregset_t *gregsetp = 0
; return 0; }
EOF
if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
gdb_cv_have_gregset_t=yes
else
@ -1517,7 +1519,7 @@ if eval "test \"`echo '$''{'gdb_cv_have_fpregset_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1521 "configure"
#line 1523 "configure"
#include "confdefs.h"
#include <sys/procfs.h>
int main() { return 0; }
@ -1525,7 +1527,7 @@ int t() {
fpregset_t *fpregsetp = 0
; return 0; }
EOF
if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
gdb_cv_have_fpregset_t=yes
else
@ -1550,7 +1552,7 @@ if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1554 "configure"
#line 1556 "configure"
#include "confdefs.h"
int main() { return 0; }
@ -1558,7 +1560,7 @@ int t() {
long double foo;
; return 0; }
EOF
if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_long_double=yes
else
@ -1586,7 +1588,7 @@ else
gdb_cv_printf_has_long_double=no
else
cat > conftest.$ac_ext <<EOF
#line 1590 "configure"
#line 1592 "configure"
#include "confdefs.h"
int main () {
@ -1596,7 +1598,7 @@ int main () {
return (strncmp ("3.14159", buf, 7));
}
EOF
{ (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
{ (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
gdb_cv_printf_has_long_double=yes
else
@ -1621,12 +1623,14 @@ 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 1625 "configure"
#line 1627 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() { return 0; }
@ -1643,7 +1647,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@ -1673,7 +1677,7 @@ else
ac_cv_func_mmap=no
else
cat > conftest.$ac_ext <<EOF
#line 1677 "configure"
#line 1681 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. */
@ -1742,7 +1746,7 @@ main()
}
EOF
{ (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
{ (eval echo configure:1750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_mmap=yes
else
@ -1925,12 +1929,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
#line 1929 "configure"
#line 1933 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -1997,7 +2001,7 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2001 "configure"
#line 2005 "configure"
#include "confdefs.h"
int main() { return 0; }
@ -2005,7 +2009,7 @@ int t() {
${x_direct_test_function}()
; return 0; }
EOF
if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@ -2119,22 +2123,26 @@ else
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for -lICE""... $ac_c" 1>&6
ac_lib_var=`echo ICE_IceConnectionNumber | tr '.-/+' '___p'`
ac_lib_var=`echo ICE'_'IceConnectionNumber | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lICE $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2130 "configure"
#line 2134 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char IceConnectionNumber();
int main() { return 0; }
int t() {
IceConnectionNumber()
; return 0; }
EOF
if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2163,22 +2171,26 @@ fi
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for -ldnet""... $ac_c" 1>&6
ac_lib_var=`echo dnet_dnet_ntoa | tr '.-/+' '___p'`
ac_lib_var=`echo dnet'_'dnet_ntoa | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2174 "configure"
#line 2182 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dnet_ntoa();
int main() { return 0; }
int t() {
dnet_ntoa()
; return 0; }
EOF
if { (eval echo configure:2182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2198,22 +2210,26 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
ac_lib_var=`echo dnet_stub_dnet_ntoa | tr '.-/+' '___p'`
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2209 "configure"
#line 2221 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dnet_ntoa();
int main() { return 0; }
int t() {
dnet_ntoa()
; return 0; }
EOF
if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2238,22 +2254,26 @@ fi
# Not sure which flavor of 386 UNIX this is, but it seems harmless to
# check for it.
echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
ac_lib_var=`echo nsl_t_accept | tr '.-/+' '___p'`
ac_lib_var=`echo nsl'_'t_accept | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2249 "configure"
#line 2265 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char t_accept();
int main() { return 0; }
int t() {
t_accept()
; return 0; }
EOF
if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2277,22 +2297,26 @@ fi
# But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch.
if test "`(uname) 2>/dev/null`" != IRIX; then
echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
ac_lib_var=`echo socket_socket | tr '.-/+' '___p'`
ac_lib_var=`echo socket'_'socket | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2288 "configure"
#line 2308 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char socket();
int main() { return 0; }
int t() {
socket()
; return 0; }
EOF
if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2389,12 +2413,12 @@ 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 2393 "configure"
#line 2417 "configure"
#include "confdefs.h"
#include <tclInt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2435,47 +2459,34 @@ if test x"${ac_cv_c_tclh}" != x ; then
fi
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
rm -rf tclmajor tclminor
orig_includes="$CPPFLAGS"
if test x"${TCLHDIR}" != x ; then
CPPFLAGS="$CPPFLAGS $TCLHDIR"
fi
if test "$cross_compiling" = yes; then
{ echo "configure: error: can't be cross compiled" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 2451 "configure"
#include "confdefs.h"
#include <stdio.h>
# Get major and minor versions of Tcl.
cat > conftest.c <<'EOF'
#include "tcl.h"
main() {
FILE *maj = fopen("tclmajor","w");
FILE *min = fopen("tclminor","w");
fprintf(maj,"%d",TCL_MAJOR_VERSION);
fprintf(min,"%d",TCL_MINOR_VERSION);
fclose(maj);
fclose(min);
return 0;
}
major = TCL_MAJOR_VERSION
minor = TCL_MINOR_VERSION
EOF
{ (eval echo configure:2466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
tclmajor=`cat tclmajor`
tclminor=`cat tclminor`
tclversion=$tclmajor.$tclminor
echo "$ac_t""$tclversion" 1>&6
rm -f tclmajor tclminor
else
echo "$ac_t""can't happen" 1>&6
tclmajor=
tclminor=
if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
# Success.
tclmajor=`egrep '^major = ' conftest.out | sed -e 's/^major = *//' -e 's/ *$//'`
tclminor=`egrep '^minor = ' conftest.out | sed -e 's/^minor = *//' -e 's/ *$//'`
fi
rm -f conftest.c conftest.out
if test -z "$tclmajor" || test -z "$tclminor"; then
echo "$ac_t""fatal error: could not find major or minor version number of Tcl" 1>&6
exit 1
fi
rm -fr conftest*
echo "$ac_t""${tclmajor}.${tclminor}" 1>&6
CPPFLAGS="${orig_includes}"
@ -2607,13 +2618,13 @@ else
ac_cv_c_tclib="-l$installedtcllibroot"
else
cat > conftest.$ac_ext <<EOF
#line 2611 "configure"
#line 2622 "configure"
#include "confdefs.h"
Tcl_AppInit()
{ exit(0); }
EOF
{ (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
{ (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_tcllib="-l$installedtcllibroot"
else
@ -2723,12 +2734,12 @@ 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 2727 "configure"
#line 2738 "configure"
#include "confdefs.h"
#include <tk.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2770,7 +2781,6 @@ fi
# if Tk is installed, extract the major/minor version
if test x"${no_tk}" = x ; then
echo $ac_n "checking Tk version""... $ac_c" 1>&6
rm -rf tkmajor tkminor
orig_includes="$CPPFLAGS"
if test x"${TCLHDIR}" != x ; then
@ -2783,42 +2793,28 @@ if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then
CPPFLAGS="$CPPFLAGS -I$x_includes"
fi
if test "$cross_compiling" = yes; then
{ echo "configure: error: can't be cross compiled" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 2792 "configure"
#include "confdefs.h"
#include <stdio.h>
# Get major and minor versions of Tk.
cat > conftest.c <<'EOF'
#include "tk.h"
main() {
FILE *maj = fopen("tkmajor","w");
FILE *min = fopen("tkminor","w");
fprintf(maj,"%d",TK_MAJOR_VERSION);
fprintf(min,"%d",TK_MINOR_VERSION);
fclose(maj);
fclose(min);
return 0;
}
major = TK_MAJOR_VERSION
minor = TK_MINOR_VERSION
EOF
{ (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
tkmajor=`cat tkmajor`
tkminor=`cat tkminor`
tkversion=$tkmajor.$tkminor
echo "$ac_t""$tkversion" 1>&6
rm -f tkmajor tkminor
else
{ echo "configure: error:
cannot compile a simple X program - suspect your xmkmf is
misconfigured and is incorrectly reporting the location of your X
include or libraries - report this to your system admin" 1>&2; exit 1; }
tkmajor=
tkminor=
if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
# Success.
tkmajor=`egrep '^major = ' conftest.out | sed -e 's/^major = *//' -e 's/ *$//'`
tkminor=`egrep '^minor = ' conftest.out | sed -e 's/^minor = *//' -e 's/ *$//'`
fi
rm -f conftest.c conftest.out
if test -z "$tkmajor" || test -z "$tkminor"; then
echo "$ac_t""fatal error: could not find major or minor version number of Tk" 1>&6
exit 1
fi
rm -fr conftest*
echo "$ac_t""${tkmajor}.${tkminor}" 1>&6
CPPFLAGS="${orig_includes}"
fi
@ -2969,13 +2965,13 @@ else
ac_cv_c_tklib="-l$installedtklibroot"
else
cat > conftest.$ac_ext <<EOF
#line 2973 "configure"
#line 2969 "configure"
#include "confdefs.h"
Tcl_AppInit()
{ exit(0); }
EOF
{ (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
{ (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_tklib="-l$installedtklibroot"
else
@ -3009,14 +3005,14 @@ fi
# beyond us.
if test $tclmajor -ge 7 -a $tclminor -ge 5 ; then
echo $ac_n "checking for -ldl""... $ac_c" 1>&6
ac_lib_var=`echo dl_main | tr '.-/+' '___p'`
ac_lib_var=`echo dl'_'main | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3020 "configure"
#line 3016 "configure"
#include "confdefs.h"
int main() { return 0; }
@ -3024,7 +3020,7 @@ int t() {
main()
; return 0; }
EOF
if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -3047,14 +3043,14 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for -ldld""... $ac_c" 1>&6
ac_lib_var=`echo dld_main | tr '.-/+' '___p'`
ac_lib_var=`echo dld'_'main | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3058 "configure"
#line 3054 "configure"
#include "confdefs.h"
int main() { return 0; }
@ -3062,7 +3058,7 @@ int t() {
main()
; return 0; }
EOF
if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -3194,10 +3190,10 @@ case "${host}" in
a29k-*-*) gdb_host=ultra3 ;;
alpha-*-linux*) gdb_host=alpha-linux ;;
alpha-*-osf1*) gdb_host=alpha-osf1 ;;
alpha-*-osf2*) gdb_host=alpha-osf2 ;;
alpha-*-osf[3456789]*) gdb_host=alpha-osf3 ;;
alpha-*-linux*) gdb_host=alpha-linux ;;
arm-*-*) gdb_host=arm ;;
@ -3352,8 +3348,8 @@ a29k-*-sym1*) gdb_target=ultra3 ;;
a29k-*-udi*) gdb_target=a29k-udi ;;
a29k-*-vxworks*) gdb_target=vx29k ;;
alpha-*-linux*) gdb_target=alpha-linux ;;
alpha-*-osf*) gdb_target=alpha-osf1 ;;
alpha-*-linux*) gdb_target=alpha-linux ;;
# start-sanitize-arc
arc-*-*) gdb_target=arc ;;
@ -3705,7 +3701,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.8"
echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@ -3894,7 +3890,7 @@ rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
@ -3942,6 +3938,12 @@ cat >> $CONFIG_STATUS <<\EOF
echo "$ac_file is unchanged"
rm -f conftest.h
else
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
# The file is in a subdirectory.
test ! -d "$ac_dir" && mkdir "$ac_dir"
fi
rm -f $ac_file
mv conftest.h $ac_file
fi

Write Preview
Loading…
Cancel
Save