configure/build: Clean up REGEXINC

REGEXINC now matches other *INC variables

diff --git a/config.site b/config.site
index fdfe76315b56c8e5859f0602fea64749fc93e25e..8c42b00b66adaaeba828c42f31bd53803128d518 100644 (file)
--- a/config.site
+++ b/config.site
@@ -160,8 +160,8 @@
 # that is included in this distribution is not to be used
 # then set REGEX=no and supply the following definitions.
 #
-#LIBREGEX=" "                          # linkage convention for regex package
-#REGEXINC="/usr/include"               # place to find regex.h
+#LIBREGEX=""                           # linkage convention for regex package
+#REGEXINC="-I/usr/include"             # place to find regex.h
 
 #
 # NLS (gettext) library support is used by default if it's found

diff --git a/configure b/configure
index c6fafe4c49e06b0565704e16b3ae00d3aee1655a..9848bff99f89f8e14d59169e505a298f65adc36c 100755 (executable)
--- a/configure
+++ b/configure
@@ -83,7 +83,7 @@ LIBINTL=
 INTLINC=
 REGEX=yes
 LIBREGEX='-L${DEPTH}/regex -lregex'
-REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
+REGEXINC='-I${DEPTH}/${TOPSRCDIR}/regex'
 CONFIG_OSFCNH=auto
 MANNUM4_5=4F
 MANNUM1_8=1M

diff --git a/defs.in b/defs.in
index eb6cab92f766c38072ccaca9ee14545e15de56dc..22a91c40cad7778e2db55f92f983dd2c4ee2a90e 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -227,8 +227,8 @@ CINCS               = ${VCINCS} ${LCINCS} ${GCINCS}
 
 GCOPTS         = @GCOPTS@ ${OPTIMIZER} @PROTOTYPES@
 GCDEFS         = @ANSICPP@
-GCINCS         = -I. -I${DEPTH} -I${REGEXINC} -I${SRCDIR} \
-                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${TIFFINC} ${INTLINC}
+GCINCS         = -I. -I${DEPTH} -I${SRCDIR} \
+                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${REGEXINC} ${TIFFINC} ${INTLINC}
 #
 # C++ flags are decomposed using the same hierarchy as C flags.
 #
@@ -243,8 +243,8 @@ C++DEFS             = ${VC++DEFS} ${LC++DEFS} ${GC++DEFS}
 C++INCS                = ${VC++INCS} ${LC++INCS} ${GC++INCS}
 
 GC++OPTS       = @GCXXOPTS@ ${OPTIMIZER}
-GC++INCS       = -I. -I${DEPTH} -I${REGEXINC} -I${SRCDIR} \
-                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${TIFFINC} ${INTLINC}
+GC++INCS       = -I. -I${DEPTH} -I${SRCDIR} \
+                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${REGEXINC} ${TIFFINC} ${INTLINC}
 GC++DEFS       = @ANSICXXPP@
 
 #