Commit cf0a67fb authored by Daniel Egger's avatar Daniel Egger Committed by Daniel Egger
Browse files

Extended the glibc regexp check and enabled substitution for Makefiles.

2001-01-03  Daniel Egger  <egger@suse.de>

        * configure.in: Extended the glibc regexp check and enabled
	substitution for Makefiles.

	* app/Makefile.am: Compile regexp only if not in glibc.

	* app/plug_in_cmds.c:
	* app/procedural_db_cmds.c:
	* app/regexrepl.c: Include the correct local headerfile
	if no new glibc with regexp is available.

	* app/regex.c:
	* app/regex.h: Moved into regexprepl.[ch] to avoid nameclashes.
parent bfb955bd
2001-01-03 Daniel Egger <egger@suse.de>
* configure.in: Extended the glibc regexp check and enabled
substitution for Makefiles.
* app/Makefile.am: Compile regexp only if not in glibc.
* app/plug_in_cmds.c:
* app/procedural_db_cmds.c:
* app/regexrepl.c: Include the correct local headerfile
if no new glibc with regexp is available.
* app/regex.c:
* app/regex.h: Moved into regexprepl.[ch] to avoid nameclashes.
2001-01-02 Daniel Egger <egger@suse.de>
* acconfig.h:
......
......@@ -2,6 +2,12 @@
scriptdata =
if HAVE_GLIBC_REGEX
regex_sources =
else
regex_sources = regexrepl.c regexrepl.h
endif
bin_PROGRAMS = gimp
noinst_LIBRARIES = libgimpim.a
......@@ -334,8 +340,6 @@ gimp_SOURCES = \
rect_select.c \
rect_select.h \
rect_selectP.h \
regex.h \
regex.c \
resolution_calibrate.c \
resolution_calibrate.h \
resize.c \
......@@ -399,7 +403,8 @@ gimp_SOURCES = \
user_install.h \
wilber.h \
xcf.c \
xcf.h
xcf.h \
$(regex_sources)
EXTRA_DIST = \
colormap_dialog.i.c \
......
......@@ -30,7 +30,12 @@
#include "appenv.h"
#include "plug_in.h"
#include "regex.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc;
......
......@@ -29,7 +29,11 @@
#include "apptypes.h"
#include "procedural_db.h"
#include "regex.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
#include "libgimp/gimpintl.h"
......
This diff is collapsed.
This diff is collapsed.
......@@ -160,7 +160,7 @@ init_syntax_once ()
#endif /* not emacs */
/* Get the interface, including the syntax bits. */
#include "regex.h"
#include "regexrepl.h"
/* isalpha etc. are used for the character classes. */
#include <ctype.h>
......
......@@ -344,9 +344,11 @@ int main()
return (1);
#endif
}], AC_DEFINE(HAVE_GLIBC_REGEX)
have_glibc_regex=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
AC_MSG_RESULT(assuming no))
AM_CONDITIONAL(HAVE_GLIBC_REGEX, test x$have_glibc_regex = xyes)
AC_HEADER_DIRENT
AC_HEADER_STDC
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment