From: Sandro Santilli <strk@keybit.net>
Date: Mon, 24 Jan 2005 15:22:56 +0000 (+0000)
Subject: Added checks for flex and  yacc paths.
X-Git-Tag: pgis_1_0_0RC2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cb0f0d6c494ded3255e8a34c820da604c1c4253;p=postgis

Added checks for flex and  yacc paths.


git-svn-id: http://svn.osgeo.org/postgis/trunk@1337 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/Makefile.config.in b/Makefile.config.in
index 01c5f2c47..5f35694b3 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -75,6 +75,12 @@ USE_ICONV=0
 # LPATH=/usr/src/postgis
 LPATH=\$$libdir
 
+#
+# Path to flex, yacc
+#
+FLEX ?= @FLEX@
+YACC ?= @YACC@
+
 #---------------------------------------------------------------
 # END OF CONFIGURATION
 #---------------------------------------------------------------
diff --git a/configure.in b/configure.in
index 2184e37c2..a356e86e1 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,12 @@ AC_ARG_WITH(pgsql-src,
   fi
 )
 
+dnl Search flex and yacc
+AC_SUBST(FLEX)
+AC_SUBST(YACC)
+AC_PATH_PROG([FLEX], [flex])
+AC_PATH_PROG([YACC], [yacc])
+
 dnl Some final checks
 
 if test $USE_GEOS -gt 0 -a ! -e $GEOS_DIR/bin/geos-config; then
@@ -66,6 +72,14 @@ if ! test -e $PGSQL_SRC/src/Makefile.global; then
 	AC_MSG_ERROR(Can't find \$PGSQL_SRC/src/Makefile.global);
 fi
 
+if test -z "$FLEX"; then
+	AC_MSG_ERROR(Can't find 'flex');
+fi
+
+if test -z "$YACC"; then
+	AC_MSG_ERROR(Can't find 'yacc');
+fi
+
 AC_MSG_RESULT([ USE_GEOS=$USE_GEOS])
 if test $USE_GEOS -gt 0; then
 	AC_MSG_RESULT([ GEOS_DIR=$GEOS_DIR])
@@ -76,4 +90,7 @@ if test $USE_PROJ -gt 0; then
 fi
 AC_MSG_RESULT([ PGSQL_SRC=$PGSQL_SRC])
 
+AC_MSG_RESULT([ FLEX=$FLEX])
+AC_MSG_RESULT([ YACC=$YACC])
+
 AC_OUTPUT(Makefile.config)