From 70c598ad3062d542d1cf9690e26e4d687d74564e Mon Sep 17 00:00:00 2001 From: Vladimir Volovich Date: Sun, 6 Apr 2008 18:30:52 +0000 Subject: rte/ordrules/ordrules.h: add #include "clisp.h", otherwise the regcomp, regerror and regexec functions will not get redefined to rpl_* equivalents on systems which lack regexp in system library (notably, mingw), and there will be link errors like ordrules.o: In function `add_rule': C:/msys/1.0/src/xindy/rte/ordrules/ordrules.c:219: undefined reference to `regcomp' C:/msys/1.0/src/xindy/rte/ordrules/ordrules.c:220: undefined reference to `regerror' ordrules.o: In function `apply_rules': C:/msys/1.0/src/xindy/rte/ordrules/ordrules.c:491: undefined reference to `regexec' C:/msys/1.0/src/xindy/rte/ordrules/ordrules.c:456: undefined reference to `regexec' even when linked with the clisp's full/regex.o (because the latter has these functions renamed with rpl_ prefix). rte/ordrules/Makefile.am: added -I$(INCLUDES) for ordrules.c rule, to find clisp.h added $(CPPFLAGS) to rules for ordrulei.o, ordrules.o, rxsub.o (e.g. to be able to pass include directory for regexp.h on mingw) git-svn-id: svn://tug.org/texlive/trunk@7335 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/rte/ordrules/Makefile.am | 6 +++--- Build/source/utils/xindy/rte/ordrules/ordrules.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.am b/Build/source/utils/xindy/rte/ordrules/Makefile.am index 1d496455928..2293cb16edc 100644 --- a/Build/source/utils/xindy/rte/ordrules/Makefile.am +++ b/Build/source/utils/xindy/rte/ordrules/Makefile.am @@ -28,13 +28,13 @@ ordrulei.c: $(srcdir)/ordrulei.lsp $(CLISP) -q -norc -c $(srcdir)/ordrulei.lsp -o ordrulei.fas ordrulei.o: ordrulei.c - $(CC) $(CFLAGS) -I$(INCLUDES) -c ordrulei.c + $(CC) $(CFLAGS) $(CPPFLAGS) -I$(INCLUDES) -c ordrulei.c ordrules.o: ordrules.c ordrules.h rxsub.h debug.h mkind.h - $(CC) $(CFLAGS) -funsigned-char -I. -c ordrules.c + $(CC) $(CFLAGS) $(CPPFLAGS) -I$(INCLUDES) -funsigned-char -I. -c ordrules.c rxsub.o: rxsub.c rxsub.h mkind.h - $(CC) $(CFLAGS) -I. -c rxsub.c + $(CC) $(CFLAGS) $(CPPFLAGS) -I. -c rxsub.c # Make a module clisp-module: ordrulei.o ordrules.o rxsub.o diff --git a/Build/source/utils/xindy/rte/ordrules/ordrules.h b/Build/source/utils/xindy/rte/ordrules/ordrules.h index 6b5f1b48a77..a252afad98b 100644 --- a/Build/source/utils/xindy/rte/ordrules/ordrules.h +++ b/Build/source/utils/xindy/rte/ordrules/ordrules.h @@ -9,6 +9,7 @@ #ifndef _ORDRULES_H #define _ORDRULES_H +#include "clisp.h" #include #include "mkind.h" #undef debug -- cgit v1.2.3