Commit 32332024 authored by Marc Lehmann's avatar Marc Lehmann

*** empty log message ***

parent 8b3666c2
Thu Jan 17 12:13:01 CET 2000 Daniel Egger <Daniel.Egger@suse.de>
(applied by pcg@goof.com)
* PLUGIN_MAINTAINERS: Add Martin Weber for sparkle and gflare.
* MAINTAINERS: Add myself.
Thu Jan 15 14:43:23 CET 2000 Daniel Egger <Daniel.Egger@suse.de>
(applied by pcg@goof.com)
* app/plug_in.c: Removed unnecessary #include "regex.h".
* app/regex.c: Removed ...
* libgimp/regex.c: Shamelessly stolen from current glibc because we
want LPGL here.
* app/regex.h: Moved to ...
* libgimp/gimpregex.h: ... and renamed it.
* plug-ins/script-fu/regex.c
* plug-ins/script-fu/regex.h: Removed.
* libgimp/Makefile.am,
* plug-ins/script-fu/Makefile.am,
* app/Makefile.am: Tweak them to match the changes.
* plug-ins/script-fu/interp_regex.c
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/procedural_db.pdb: Include "libgimp/regex.h"
instead of "regex.h".
* config.h.in
* configure.in
* acconfig.h: Check, whether regex is provided by standard libs.
If this is the case avoid compiling it and use the standard one,
thus reducing compile time and code and saveing diskspace.
Sun Jan 23 23:08:18 2000 Jay Cox <jaycox@earthlink.net>
* plug-ins/common/psd.c: load the resolution info from the psd file.
......
......@@ -59,7 +59,7 @@ Name: Marc Lehmann
Email: pcg@goof.com
url: http://gimp.pages.de/
ircnick: schmorp
expertise: perl, language binding issues
expertise: perl, language binding issues, THE PDB, libgimp/gimpcompat.h
current work: perl-interface, language interface design
commit access: yes
......@@ -202,3 +202,11 @@ current work: I fell into this rabbit hole by writing highly verbose patch docum
which just goes to show that succinctness is its own reward. My patch documentation
archive is http://idt.net/~gosgood/gimp-patch/
commit access: yes
Name: Daniel Egger
Email: Daniel.Egger@suse.de
url:
expertise: Localisation, optimisation, cleanup.
current work: Cleaning up the code base while trying to find a
proper solution for localisation.
commit access: no
......@@ -364,7 +364,7 @@ COMMENT : Could do with a code splitting & UI tidyup.
-----------
NAME : gflare
AUTHOR : Eiichi Takamori
MAINTAINER :
MAINTAINER : Martin Weber martweb@gmx.net
SIZE : 175.7 kB in 3 files (only C files counted)
COMMENT :
-----------
......@@ -642,7 +642,7 @@ NAME : perl
AUTHOR : Marc Lehmann <pcg@goof.com> et al.
MAINTAINER :
SIZE : 105.4 kB in 5 files (only C files counted)
COMMENT :
COMMENT : contact pcg@goof.com when you modify files, so your changes aren't lost
-----------
NAME : pix
AUTHOR : Michael Taylor
......@@ -826,7 +826,7 @@ COMMENT :
-----------
NAME : sparkle
AUTHOR : John Beale, & (ported to GIMP v0.54) Michael J. Hammel & ted to GIMP v1.0) Spencer Kimball
MAINTAINER :
MAINTAINER : Martin Weber matweb@gmx.net
SIZE : 35.6 kB in 1 file (only C files counted)
COMMENT :
-----------
......
......@@ -35,11 +35,13 @@
#undef HAVE_SYS_SELECT_H
#undef HAVE_SYS_TIME_H
#undef HAVE_SYS_TIMES_H
#undef HAVE_REGEX_H
#undef HAVE_UNISTD_H
#undef HAVE_VPRINTF
#undef HAVE_VSNPRINTF
#undef IPC_RMID_DEFERRED_RELEASE
#undef HAVE_NATIVE_REGEX
#undef NO_DIFFTIME
#undef NO_FD_SET
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -68,7 +68,6 @@
#define _P_NOWAIT P_NOWAIT
#endif
#include "regex.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpenv.h"
......
......@@ -85,11 +85,13 @@
#undef HAVE_SYS_SELECT_H
#undef HAVE_SYS_TIME_H
#undef HAVE_SYS_TIMES_H
#undef HAVE_REGEX_H
#undef HAVE_UNISTD_H
#undef HAVE_VPRINTF
#undef HAVE_VSNPRINTF
#undef IPC_RMID_DEFERRED_RELEASE
#undef HAVE_NATIVE_REGEX
#undef NO_DIFFTIME
#undef NO_FD_SET
......@@ -97,8 +99,6 @@
#undef RAND_FUNC
#undef SRAND_FUNC
#undef USE_PTHREADS
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT
......
......@@ -324,6 +324,27 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then
AC_MSG_RESULT(assuming no))
fi
dnl Check for shared memory
AC_CHECK_HEADER(regex.h, AC_DEFINE(HAVE_REGEX_H), regex=yes)
if test "$ac_cv_header_regex_h" = "yes"; then
AC_MSG_CHECKING(whether we have native regex support)
AC_TRY_RUN([
#include <sys/types.h>
#include <regex.h>
int main()
{
regex_t regex;
regcomp (&regex, "Test it\n", REG_ICASE);
regfree (&regex);
exit (0);
}
],
AC_DEFINE(HAVE_NATIVE_REGEX)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
AC_MSG_RESULT(assuming no))
fi
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
......
......@@ -5,6 +5,7 @@ gimpincludedir = $(includedir)/libgimp
AM_CPPFLAGS = \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DREGEX_MALLOC \
@GIMP_THREAD_FLAGS@
INCLUDES = \
......@@ -43,6 +44,7 @@ libgimpi_a_SOURCES = \
gimppatheditor.h \
gimpprotocol.c \
gimpprotocol.h \
gimpregex.h \
gimpsizeentry.c \
gimpsizeentry.h \
gimpunitmenu.c \
......@@ -58,7 +60,8 @@ libgimpi_a_SOURCES = \
parasiteF.h \
parasiteP.h \
parasiteio.c \
parasiteio.h
parasiteio.h \
regex.c
if STATICLIBS
## Evil hack to insure all deps are satisfied on first-run make
......@@ -89,6 +92,7 @@ libgimp_la_SOURCES = \
gimppixelrgn.c \
gimpprotocol.c \
gimpprotocol.h \
gimpregex.h \
gimpselection.c \
gimptile.c \
gimpunit.c \
......@@ -103,6 +107,7 @@ libgimp_la_SOURCES = \
parasiteP.h \
parasiteio.c \
parasiteio.h \
regex.c \
stdplugins-intl.h
libgimpui_la_SOURCES = \
......@@ -142,6 +147,7 @@ gimpinclude_HEADERS = \
gimpmenu.h \
gimpmodule.h \
gimppatheditor.h \
gimpregex.h \
gimpsizeentry.h \
gimpui.h \
gimpunit.h \
......
This diff is collapsed.
This diff is collapsed.
......@@ -24,9 +24,7 @@ script_fu_SOURCES = \
script-fu-server.h \
script-fu-enums.h \
siod.h \
siodp.h \
regex.h \
regex.c
siodp.h
INCLUDES = \
-I$(top_srcdir) \
......@@ -40,8 +38,7 @@ LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
AM_CPPFLAGS = \
-DREGEX_MALLOC
AM_CPPFLAGS =
.PHONY: files
......
......@@ -2,9 +2,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "regex.h"
#include "siod.h"
#include "libgimp/gimpregex.h"
/* OSF/1 doc says that POSIX and XPG4 include regcomp in libc.
So we might as well set ourselves up to take advantage of it.
This functionality is also available in hpux, and is also provided
......
......@@ -2,9 +2,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "regex.h"
#include "siod.h"
#include "libgimp/gimpregex.h"
/* OSF/1 doc says that POSIX and XPG4 include regcomp in libc.
So we might as well set ourselves up to take advantage of it.
This functionality is also available in hpux, and is also provided
......
......@@ -241,7 +241,7 @@ CODE
);
}
@headers = qw("plug_in.h" "regex.h" "appenv.h" <string.h> <stdlib.h>);
@headers = qw("plug_in.h" "libgimp/gimpregex.h" "appenv.h" <string.h> <stdlib.h>);
$extra{app}->{code} = <<'CODE';
static int
......
......@@ -180,7 +180,7 @@ HELP
);
%invoke = (
headers => [ qw(<stdlib.h> "regex.h") ],
headers => [ qw(<stdlib.h> "libgimp/gimpregex.h") ],
vars => [ 'PDBQuery pdb_query' ],
code => <<CODE
{
......
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