aboutsummaryrefslogtreecommitdiff
path: root/gdb/gdbserver/configure
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2015-07-15 17:37:27 +0200
committerJan Kratochvil <jan.kratochvil@redhat.com>2015-07-15 17:39:17 +0200
commit6e5b4429db0d66e2d0b27e1bcfe4709f3dae73ed (patch)
tree7936b330582c83cb83293d8e6eca41bc8803dbda /gdb/gdbserver/configure
parentddc98fbf2fd9e244a215a4d09e559180dc573a14 (diff)
downloadgdb-6e5b4429db0d66e2d0b27e1bcfe4709f3dae73ed.zip
gdb-6e5b4429db0d66e2d0b27e1bcfe4709f3dae73ed.tar.gz
gdb-6e5b4429db0d66e2d0b27e1bcfe4709f3dae73ed.tar.bz2
Move gdb_regex* to common/
Later patches need regex support also in gdbserver. gdb/ChangeLog 2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com> * Makefile.in (HFILES_NO_SRCDIR): Change gdb_regex.h to common/gdb_regex.h. (COMMON_OBS): Add gdb_regex.o. (gdb_regex.o): New. * common/common.m4 (GDB_AC_COMMON): Add gdb_use_included_regex, --without-included-regex and USE_INCLUDED_REGEX. * common/gdb_regex.c: New file from utils.c functions. * common/gdb_regex.h: Move it here from gdb_regex.h, update include file wrapping define name. * configure: Rebuilt. * configure.ac (gdb_use_included_regex, --without-included-regex) (USE_INCLUDED_REGEX): Move them to common/common.m4. * gdb_regex.h: Move it to common/gdb_regex.h. * utils.c: Remove include gdb_regex.h. (do_regfree_cleanup, make_regfree_cleanup, get_regcomp_error) (compile_rx_or_error): Move them to common/gdb_regex.c. gdb/gdbserver/ChangeLog 2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com> * Makefile.in (OBS): Add gdb_regex.o. (gdb_regex.o): New. * config.in: Rebuilt. * configure: Rebuilt.
Diffstat (limited to 'gdb/gdbserver/configure')
-rwxr-xr-xgdb/gdbserver/configure56
1 files changed, 56 insertions, 0 deletions
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index e8cf136..c7ae6be 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -694,6 +694,7 @@ enable_maintainer_mode
enable_largefile
enable_build_with_cxx
enable_libmcheck
+with_included_regex
with_ust
with_ust_include
with_ust_lib
@@ -1345,6 +1346,10 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --without-included-regex
+ don't use included regex; this is the default on
+ systems with version 2 of the GNU C library (use
+ with caution on other system)
--with-ust=PATH Specify prefix directory for the installed UST package
Equivalent to --with-ust-include=PATH/include
plus --with-ust-lib=PATH/lib
@@ -5747,6 +5752,57 @@ $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
fi
+ # Assume we'll default to using the included libiberty regex.
+ gdb_use_included_regex=yes
+
+ # However, if the system regex is GNU regex, then default to *not*
+ # using the included regex.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU regex" >&5
+$as_echo_n "checking for GNU regex... " >&6; }
+if test "${gdb_cv_have_gnu_regex+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <gnu-versions.h>
+int
+main ()
+{
+#define REGEX_INTERFACE_VERSION 1
+ #if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION
+ # error "Version mismatch"
+ #endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gdb_cv_have_gnu_regex=yes
+else
+ gdb_cv_have_gnu_regex=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_gnu_regex" >&5
+$as_echo "$gdb_cv_have_gnu_regex" >&6; }
+ if test $gdb_cv_have_gnu_regex = yes; then
+ gdb_use_included_regex=no
+ fi
+
+
+# Check whether --with-included-regex was given.
+if test "${with_included_regex+set}" = set; then :
+ withval=$with_included_regex; gdb_with_regex=$withval
+else
+ gdb_with_regex=$gdb_use_included_regex
+fi
+
+ if test "$gdb_with_regex" = yes; then
+
+$as_echo "#define USE_INCLUDED_REGEX 1" >>confdefs.h
+
+ fi
+
# Check for UST
ustlibs=""