Commit 65867d40 authored by Daniel Egger's avatar Daniel Egger Committed by Daniel Egger
Browse files

Conditionally compile regex if not available in glibc.

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

        * app/plug_in_cmds.c:
	* app/procedural_db_cmds.c:
	* plug-ins/script-fu/Makefile.am:
	* plug-ins/script-fu/interp_regex.c:
	* plug-ins/script-fu/regexrepl.c: Conditionally compile
	regex if not available in glibc.

	* plug-ins/script-fu/regex.c:
	* plug-ins/script-fu/regex.h: Renamed files to regexrepl.[ch].
parent cf0a67fb
2001-01-03 Daniel Egger <egger@suse.de>
* app/plug_in_cmds.c:
* app/procedural_db_cmds.c:
* plug-ins/script-fu/Makefile.am:
* plug-ins/script-fu/interp_regex.c:
* plug-ins/script-fu/regexrepl.c: Conditionally compile
regex if not available in glibc.
* plug-ins/script-fu/regex.c:
* plug-ins/script-fu/regex.h: Renamed files to regexrepl.[ch].
2001-01-03 Daniel Egger <egger@suse.de>
* configure.in: Extended the glibc regexp check and enabled
......
......@@ -30,12 +30,7 @@
#include "appenv.h"
#include "plug_in.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
#include "regex.h"
static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc;
......
......@@ -29,11 +29,7 @@
#include "apptypes.h"
#include "procedural_db.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
#include "regex.h"
#include "libgimp/gimpintl.h"
......
## Process this file with automake to produce Makefile.in
if HAVE_GLIBC_REGEX
regex_sources =
else
regex_sources = regexrepl.c regexrepl.h
endif
SUBDIRS = scripts
libexecdir = $(gimpplugindir)/plug-ins
......@@ -13,8 +19,6 @@ script_fu_SOURCES = \
interp_slib.c \
interp_sliba.c \
interp_trace.c \
regex.c \
regex.h \
script-fu.c \
script-fu-console.c \
script-fu-console.h \
......@@ -27,7 +31,8 @@ script_fu_SOURCES = \
script-fu-server.h \
script-fu-enums.h \
siod.h \
siodp.h
siodp.h \
$(regex_sources)
INCLUDES = \
-I$(top_srcdir) \
......
......@@ -2,7 +2,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "regex.h"
#ifndef HAVE_GLIBC_REGEX
#include "regexrepl.h"
#else
#include <regex.h>
#endif
#include "siod.h"
/* OSF/1 doc says that POSIX and XPG4 include regcomp in libc.
......
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>
......
......@@ -2,7 +2,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "regex.h"
#ifndef HAVE_GLIBC_REGEX
#include "regexrepl.h"
#else
#include <regex.h>
#endif
#include "siod.h"
/* OSF/1 doc says that POSIX and XPG4 include regcomp in libc.
......
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