This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
[RFC] Cleanup USE_INCLUDED_REGEX
- To: GDB Patches <gdb-patches at sourceware dot cygnus dot com>
- Subject: [RFC] Cleanup USE_INCLUDED_REGEX
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Mon, 10 Apr 2000 22:19:19 +1000
- Organization: Cygnus Solutions
FYI,
The attatched cleans up the -DUSE_INCLUDED_REGEX by moving it to
acconfig.h/config.h.
Look ok?
Andrew
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.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.25
diff -p -r1.25 Makefile.in
*** Makefile.in 2000/04/09 14:37:28 1.25
--- Makefile.in 2000/04/10 12:16:18
*************** MMALLOC_CFLAGS = @MMALLOC_CFLAGS@
*** 117,123 ****
# 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
--- 117,122 ----
*************** INTERNAL_WARN_CFLAGS = \
*** 277,283 ****
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
$(INTL_CFLAGS) $(TUI_CFLAGS) $(ENABLE_CFLAGS) \
! $(REGEX_CFLAGS) $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
# LDFLAGS is specifically reserved for setting from the command line
--- 276,282 ----
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
$(INTL_CFLAGS) $(TUI_CFLAGS) $(ENABLE_CFLAGS) \
! $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
# LDFLAGS is specifically reserved for setting from the command line
*************** copying.txt:
*** 954,960 ****
# Make copying.c from COPYING
copying.c: copying.txt copying.awk
! awk -f $(srcdir)/copying.awk < $(srcdir)/copying.txt > copying.c
version.c: Makefile
rm -f version.c
--- 953,959 ----
# Make copying.c from COPYING
copying.c: copying.txt copying.awk
! awk -f $(srcdir)/copying.awk < copying.txt > copying.c
version.c: Makefile
rm -f version.c
Index: acconfig.h
===================================================================
RCS file: /cvs/src/src/gdb/acconfig.h,v
retrieving revision 1.4
diff -p -r1.4 acconfig.h
*** acconfig.h 2000/04/07 01:16:17 1.4
--- acconfig.h 2000/04/10 12:16:29
***************
*** 91,93 ****
--- 91,96 ----
/* 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
Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.18
diff -p -r1.18 configure.in
*** configure.in 2000/04/08 11:13:17 1.18
--- configure.in 2000/04/10 12:16:44
*************** AC_ARG_WITH(included-regex,
*** 517,524 ****
*) 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,
--- 517,522 ----
*************** if test $want_included_regex = false; th
*** 532,544 ****
[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=
fi
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,
--- 530,545 ----
[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 = 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)
# In the Cygwin environment, we need some additional flags.
AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,