From 759be00efe0f59ecbf28b8897939e28dbeacdcd2 Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Wed, 7 Jan 2004 00:28:46 +0000
Subject: [PATCH] Fixed a compile bug regarding TRE

---
 Changes               | 1 +
 Makefile.in           | 2 +-
 autoconf/configure.in | 2 ++
 configure             | 3 +++
 include/badwords.h    | 2 +-
 include/struct.h      | 2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index bbb101b88..1a8619c40 100644
--- a/Changes
+++ b/Changes
@@ -2696,3 +2696,4 @@ seen. gmtime warning still there
 - Cleaned up the /kick code to make it a bit faster
 - Reactivated TRE compile
 - Finally made Unreal use TRE under *nix
+- Fixed a compile problem reported by ace (#0001474)
diff --git a/Makefile.in b/Makefile.in
index b6b0e971b..004ab5f03 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ IRCDLIBS=@IRCDLIBS@ -L../extras/regexp/lib -ltre
 CRYPTOLIB=@CRYPTOLIB@
 OPENSSLINCLUDES=
 
-XCFLAGS=@CFLAGS@
+XCFLAGS=-I@TREINCDIR@ @CFLAGS@
 #
 # use the following on MIPS:
 #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)
diff --git a/autoconf/configure.in b/autoconf/configure.in
index 38627771d..2844e73dd 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -371,6 +371,8 @@ AC_MSG_RESULT(compiling TRE regex library)
 make 
 AC_MSG_RESULT(installing TRE regex library)
 make install
+TREINCDIR="$cur_dir/extras/regexp/include"
+AC_SUBST(TREINCDIR)
 cd $cur_dir
 AC_OUTPUT(Makefile src/modules/Makefile unreal ircdcron/ircdchk)
 chmod 0700 unreal
diff --git a/configure b/configure
index 5674a1f77..a12244278 100755
--- a/configure
+++ b/configure
@@ -9881,6 +9881,8 @@ make
 echo "$as_me:$LINENO: result: installing TRE regex library" >&5
 echo "${ECHO_T}installing TRE regex library" >&6
 make install
+TREINCDIR="$cur_dir/extras/regexp/include"
+
 cd $cur_dir
 ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk"
 cat >confcache <<\_ACEOF
@@ -10462,6 +10464,7 @@ s,@URL@,$URL,;t t
 s,@IRCDDIR@,$IRCDDIR,;t t
 s,@BINDIR@,$BINDIR,;t t
 s,@FD_SETSIZE@,$FD_SETSIZE,;t t
+s,@TREINCDIR@,$TREINCDIR,;t t
 CEOF
 
 _ACEOF
diff --git a/include/badwords.h b/include/badwords.h
index 3006f6e7b..e91c9d579 100644
--- a/include/badwords.h
+++ b/include/badwords.h
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../extras/regexp/include/tre/regex.h"
+#include "tre/regex.h"
 
 #define MAX_MATCH       1
 #define MAX_WORDLEN	64
diff --git a/include/struct.h b/include/struct.h
index b3ca662d4..67675ffa5 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -61,7 +61,7 @@
 #include "zip.h"
 #endif
 #include "auth.h" 
-#include "../extras/regexp/include/tre/regex.h"
+#include "tre/regex.h"
 extern int sendanyways;