aboutsummaryrefslogtreecommitdiff
path: root/gdb/aclocal.m4
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>1996-05-28 20:34:21 +0000
committerTom Tromey <tromey@redhat.com>1996-05-28 20:34:21 +0000
commite44d14910c888008e3bc1aa5147a981d3b5b6dc8 (patch)
treecbdef4acb0c201d04796abdbdc9a51cbad52c0bc /gdb/aclocal.m4
parent076929515b60adabcb89951fe8dc1040a42e7f6e (diff)
downloadgdb-e44d14910c888008e3bc1aa5147a981d3b5b6dc8.zip
gdb-e44d14910c888008e3bc1aa5147a981d3b5b6dc8.tar.gz
gdb-e44d14910c888008e3bc1aa5147a981d3b5b6dc8.tar.bz2
* configure: Regenerated.
* aclocal.m4 (CY_AC_PATH_TCLH): Don't use AC_TRY_RUN. (CY_AC_PATH_TKH): Don't use AC_TRY_RUN.
Diffstat (limited to 'gdb/aclocal.m4')
-rw-r--r--gdb/aclocal.m488
1 files changed, 42 insertions, 46 deletions
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index fac5095..52fde83 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -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