mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-21 01:12:32 +08:00
Cleanup USE_INCLUDED_REGEX. Move -D to acconfig.h.
This commit is contained in:
Andrew Cagney
parent
f38e884d67
commit
e48f66e46e
@ -1,3 +1,10 @@
|
||||
Mon Apr 10 21:58:36 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||
|
||||
* acconfig.h (USE_INCLUDED_REGEX): Add.
|
||||
* Makefile.in (REGEX_CFLAGS): Delete
|
||||
* configure.in (REGEX_CFLAGS): Delete. Use AC_DEFINE instead.
|
||||
* configure, config.in: Re-generate.
|
||||
|
||||
2000-04-10 Philip Blundell <philb@gnu.org>
|
||||
|
||||
* arm-linux-nat.c (arm_skip_solib_resolver): Remove and move to
|
||||
|
||||
@ -117,7 +117,6 @@ MMALLOC_CFLAGS = @MMALLOC_CFLAGS@
|
||||
# We are using our own version of REGEX now to be consistent across
|
||||
# machines.
|
||||
REGEX = @REGEX@
|
||||
REGEX_CFLAGS = @REGEX_CFLAGS@
|
||||
|
||||
# Where is the BFD library? Typically in ../bfd.
|
||||
BFD_DIR = ../bfd
|
||||
@ -277,7 +276,7 @@ INTERNAL_WARN_CFLAGS = \
|
||||
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
|
||||
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
|
||||
$(INTL_CFLAGS) $(TUI_CFLAGS) $(ENABLE_CFLAGS) \
|
||||
$(REGEX_CFLAGS) $(GDB_WARN_CFLAGS)
|
||||
$(GDB_WARN_CFLAGS)
|
||||
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
|
||||
|
||||
# LDFLAGS is specifically reserved for setting from the command line
|
||||
@ -954,7 +953,7 @@ copying.txt:
|
||||
|
||||
# Make copying.c from COPYING
|
||||
copying.c: copying.txt copying.awk
|
||||
awk -f $(srcdir)/copying.awk < $(srcdir)/copying.txt > copying.c
|
||||
awk -f $(srcdir)/copying.awk < copying.txt > copying.c
|
||||
|
||||
version.c: Makefile
|
||||
rm -f version.c
|
||||
|
||||
@ -91,3 +91,6 @@
|
||||
|
||||
/* Define if <sys/ptrace.h> defines the PTRACE_GETXFPREGS request. */
|
||||
#undef HAVE_PTRACE_GETXFPREGS
|
||||
|
||||
/* Define if gnu-regex.c included with GDB should be used. */
|
||||
#undef USE_INCLUDED_REGEX
|
||||
|
||||
@ -126,6 +126,9 @@
|
||||
/* Define if <sys/ptrace.h> defines the PTRACE_GETXFPREGS request. */
|
||||
#undef HAVE_PTRACE_GETXFPREGS
|
||||
|
||||
/* Define if gnu-regex.c included with GDB should be used. */
|
||||
#undef USE_INCLUDED_REGEX
|
||||
|
||||
/* Define if you have the __argz_count function. */
|
||||
#undef HAVE___ARGZ_COUNT
|
||||
|
||||
|
||||
121
gdb/configure
vendored
121
gdb/configure
vendored
@ -5500,16 +5500,14 @@ else
|
||||
want_included_regex=true
|
||||
fi
|
||||
|
||||
REGEX="gnu-regex.o"
|
||||
REGEX_CFLAGS="-DUSE_INCLUDED_REGEX"
|
||||
if test $want_included_regex = false; then
|
||||
echo $ac_n "checking for GNU regex""... $ac_c" 1>&6
|
||||
echo "configure:5508: checking for GNU regex" >&5
|
||||
echo "configure:5506: checking for GNU regex" >&5
|
||||
if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5513 "configure"
|
||||
#line 5511 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gnu-versions.h>
|
||||
#include <sys/types.h>
|
||||
@ -5521,7 +5519,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
gdb_cv_have_gnu_regex=yes
|
||||
else
|
||||
@ -5534,22 +5532,28 @@ rm -f conftest*
|
||||
fi
|
||||
|
||||
echo "$ac_t""$gdb_cv_have_gnu_regex" 1>&6
|
||||
if test $gdb_cv_have_gnu_regex = yes; then
|
||||
REGEX=
|
||||
REGEX_CFLAGS=
|
||||
if test $gdb_cv_have_gnu_regex = no; then
|
||||
want_included_regex=true
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x${want_included_regex} = xtrue; then
|
||||
REGEX="gnu-regex.o"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define USE_INCLUDED_REGEX 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# In the Cygwin environment, we need some additional flags.
|
||||
echo $ac_n "checking for cygwin""... $ac_c" 1>&6
|
||||
echo "configure:5548: checking for cygwin" >&5
|
||||
echo "configure:5552: checking for cygwin" >&5
|
||||
if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5553 "configure"
|
||||
#line 5557 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if defined (__CYGWIN__) || defined (__CYGWIN32__)
|
||||
@ -5583,7 +5587,7 @@ if test x$gdb_cv_os_cygwin = xyes; then
|
||||
else
|
||||
TERM_LIB=
|
||||
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
|
||||
echo "configure:5587: checking for tgetent in -lncurses" >&5
|
||||
echo "configure:5591: checking for tgetent in -lncurses" >&5
|
||||
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5591,7 +5595,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lncurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5595 "configure"
|
||||
#line 5599 "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
|
||||
@ -5602,7 +5606,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5621,7 +5625,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6
|
||||
echo "configure:5625: checking for tgetent in -lHcurses" >&5
|
||||
echo "configure:5629: checking for tgetent in -lHcurses" >&5
|
||||
ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5629,7 +5633,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lHcurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5633 "configure"
|
||||
#line 5637 "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
|
||||
@ -5640,7 +5644,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5659,7 +5663,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
|
||||
echo "configure:5663: checking for tgetent in -ltermlib" >&5
|
||||
echo "configure:5667: checking for tgetent in -ltermlib" >&5
|
||||
ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5667,7 +5671,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltermlib $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5671 "configure"
|
||||
#line 5675 "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
|
||||
@ -5678,7 +5682,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5697,7 +5701,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
|
||||
echo "configure:5701: checking for tgetent in -ltermcap" >&5
|
||||
echo "configure:5705: checking for tgetent in -ltermcap" >&5
|
||||
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5705,7 +5709,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltermcap $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5709 "configure"
|
||||
#line 5713 "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
|
||||
@ -5716,7 +5720,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5735,7 +5739,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
|
||||
echo "configure:5739: checking for tgetent in -lcurses" >&5
|
||||
echo "configure:5743: checking for tgetent in -lcurses" >&5
|
||||
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5743,7 +5747,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5747 "configure"
|
||||
#line 5751 "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
|
||||
@ -5754,7 +5758,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5773,7 +5777,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6
|
||||
echo "configure:5777: checking for tgetent in -lterminfo" >&5
|
||||
echo "configure:5781: checking for tgetent in -lterminfo" >&5
|
||||
ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -5781,7 +5785,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lterminfo $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5785 "configure"
|
||||
#line 5789 "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
|
||||
@ -5792,7 +5796,7 @@ int main() {
|
||||
tgetent()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -5950,7 +5954,7 @@ if test "${with_tclconfig+set}" = set; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
|
||||
echo "configure:5954: checking for Tcl configuration" >&5
|
||||
echo "configure:5958: checking for Tcl configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6058,7 +6062,7 @@ if test "${with_tkconfig+set}" = set; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
|
||||
echo "configure:6062: checking for Tk configuration" >&5
|
||||
echo "configure:6066: checking for Tk configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6154,7 +6158,7 @@ fi
|
||||
|
||||
no_tcl=true
|
||||
echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
|
||||
echo "configure:6158: checking for Tcl private headers. dir=${configdir}" >&5
|
||||
echo "configure:6162: checking for Tcl private headers. dir=${configdir}" >&5
|
||||
# Check whether --with-tclinclude or --without-tclinclude was given.
|
||||
if test "${with_tclinclude+set}" = set; then
|
||||
withval="$with_tclinclude"
|
||||
@ -6220,17 +6224,17 @@ fi
|
||||
if test x"${ac_cv_c_tclh}" = x ; then
|
||||
ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
|
||||
echo "configure:6224: checking for tclInt.h" >&5
|
||||
echo "configure:6228: checking for tclInt.h" >&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 6229 "configure"
|
||||
#line 6233 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tclInt.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:6234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:6238: \"$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*
|
||||
@ -6290,7 +6294,7 @@ fi
|
||||
#
|
||||
no_tk=true
|
||||
echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
|
||||
echo "configure:6294: checking for Tk private headers" >&5
|
||||
echo "configure:6298: checking for Tk private headers" >&5
|
||||
# Check whether --with-tkinclude or --without-tkinclude was given.
|
||||
if test "${with_tkinclude+set}" = set; then
|
||||
withval="$with_tkinclude"
|
||||
@ -6356,17 +6360,17 @@ fi
|
||||
if test x"${ac_cv_c_tkh}" = x ; then
|
||||
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tk.h""... $ac_c" 1>&6
|
||||
echo "configure:6360: checking for tk.h" >&5
|
||||
echo "configure:6364: checking for tk.h" >&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 6365 "configure"
|
||||
#line 6369 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tk.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:6370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:6374: \"$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*
|
||||
@ -6412,7 +6416,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
|
||||
echo "configure:6416: checking for Itcl private headers. srcdir=${srcdir}" >&5
|
||||
echo "configure:6420: checking for Itcl private headers. srcdir=${srcdir}" >&5
|
||||
if test x"${ac_cv_c_itclh}" = x ; then
|
||||
for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
|
||||
if test -f $i/generic/itcl.h ; then
|
||||
@ -6435,7 +6439,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6
|
||||
echo "configure:6439: checking for Itk private headers. srcdir=${srcdir}" >&5
|
||||
echo "configure:6443: checking for Itk private headers. srcdir=${srcdir}" >&5
|
||||
if test x"${ac_cv_c_itkh}" = x ; then
|
||||
for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
|
||||
if test -f $i/generic/itk.h ; then
|
||||
@ -6458,7 +6462,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6
|
||||
echo "configure:6462: checking for Tix private headers. srcdir=${srcdir}" >&5
|
||||
echo "configure:6466: checking for Tix private headers. srcdir=${srcdir}" >&5
|
||||
if test x"${ac_cv_c_tixh}" = x ; then
|
||||
for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
|
||||
if test -f $i/generic/tix.h ; then
|
||||
@ -6496,7 +6500,7 @@ if test "${with_itclconfig+set}" = set; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6
|
||||
echo "configure:6500: checking for Itcl configuration" >&5
|
||||
echo "configure:6504: checking for Itcl configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6608,7 +6612,7 @@ if test "${with_itkconfig+set}" = set; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6
|
||||
echo "configure:6612: checking for Itk configuration" >&5
|
||||
echo "configure:6616: checking for Itk configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6720,7 +6724,7 @@ if test "${with_tixconfig+set}" = set; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6
|
||||
echo "configure:6724: checking for Tix configuration" >&5
|
||||
echo "configure:6728: checking for Tix configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6859,7 +6863,7 @@ fi
|
||||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
echo $ac_n "checking for X""... $ac_c" 1>&6
|
||||
echo "configure:6863: checking for X" >&5
|
||||
echo "configure:6867: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
@ -6921,12 +6925,12 @@ if test "$ac_x_includes" = NO; then
|
||||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6925 "configure"
|
||||
#line 6929 "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:6930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:6934: \"$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*
|
||||
@ -6995,14 +6999,14 @@ if test "$ac_x_libraries" = NO; then
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6999 "configure"
|
||||
#line 7003 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:7010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
@ -7284,7 +7288,7 @@ files="${files} config/nm-empty.h"
|
||||
links="${links} nm.h"
|
||||
fi
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:7288: checking whether ln -s works" >&5
|
||||
echo "configure:7292: checking whether ln -s works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7308,12 +7312,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:7312: checking for Cygwin environment" >&5
|
||||
echo "configure:7316: checking for Cygwin environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7317 "configure"
|
||||
#line 7321 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
@ -7324,7 +7328,7 @@ int main() {
|
||||
return __CYGWIN__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:7332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cygwin=yes
|
||||
else
|
||||
@ -7341,19 +7345,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
|
||||
CYGWIN=
|
||||
test "$ac_cv_cygwin" = yes && CYGWIN=yes
|
||||
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
|
||||
echo "configure:7345: checking for mingw32 environment" >&5
|
||||
echo "configure:7349: checking for mingw32 environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7350 "configure"
|
||||
#line 7354 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:7357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:7361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_mingw32=yes
|
||||
else
|
||||
@ -7372,7 +7376,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
|
||||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:7376: checking for executable suffix" >&5
|
||||
echo "configure:7380: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7382,7 +7386,7 @@ else
|
||||
rm -f conftest*
|
||||
echo 'int main () { return 0; }' > conftest.$ac_ext
|
||||
ac_cv_exeext=
|
||||
if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.c | *.o | *.obj | *.ilk | *.pdb) ;;
|
||||
@ -7593,7 +7597,6 @@ s%@WERROR_CFLAGS@%$WERROR_CFLAGS%g
|
||||
s%@MMALLOC_CFLAGS@%$MMALLOC_CFLAGS%g
|
||||
s%@MMALLOC@%$MMALLOC%g
|
||||
s%@REGEX@%$REGEX%g
|
||||
s%@REGEX_CFLAGS@%$REGEX_CFLAGS%g
|
||||
s%@DLLTOOL@%$DLLTOOL%g
|
||||
s%@WINDRES@%$WINDRES%g
|
||||
s%@TERM_LIB@%$TERM_LIB%g
|
||||
|
||||
@ -517,8 +517,6 @@ AC_ARG_WITH(included-regex,
|
||||
*) AC_MSG_ERROR(bad value ${withval} for GDB with-included-regex option) ;;
|
||||
esac],[want_included_regex=true])dnl
|
||||
|
||||
REGEX="gnu-regex.o"
|
||||
REGEX_CFLAGS="-DUSE_INCLUDED_REGEX"
|
||||
if test $want_included_regex = false; then
|
||||
AC_MSG_CHECKING(for GNU regex)
|
||||
AC_CACHE_VAL(gdb_cv_have_gnu_regex,
|
||||
@ -532,13 +530,16 @@ if test $want_included_regex = false; then
|
||||
[gdb_cv_have_gnu_regex=yes],
|
||||
[gdb_cv_have_gnu_regex=no])])
|
||||
AC_MSG_RESULT($gdb_cv_have_gnu_regex)
|
||||
if test $gdb_cv_have_gnu_regex = yes; then
|
||||
REGEX=
|
||||
REGEX_CFLAGS=
|
||||
if test $gdb_cv_have_gnu_regex = no; then
|
||||
want_included_regex=true
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x${want_included_regex} = xtrue; then
|
||||
REGEX="gnu-regex.o"
|
||||
AC_DEFINE(USE_INCLUDED_REGEX)
|
||||
fi
|
||||
AC_SUBST(REGEX)
|
||||
AC_SUBST(REGEX_CFLAGS)
|
||||
|
||||
# In the Cygwin environment, we need some additional flags.
|
||||
AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user