rev 155 - in trunk: . modules modules/Re

Author: bcollins
Date: 2004-03-27 12:00:14 -0500 (Sat, 27 Mar 2004)
New Revision: 155

Modified:
   trunk/configure
   trunk/configure.in
   trunk/modules/Makefile.in
   trunk/modules/Re/Makefile.in
Log:
Move logic for boost-regex Re build.


Modified: trunk/configure
===================================================================
--- trunk/configure	2004-03-27 16:54:54 UTC (rev 154)
+++ trunk/configure	2004-03-27 17:00:14 UTC (rev 155)
@@ -18890,7 +18890,7 @@
 PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${VERSION}"
 
 
-HAVE_BOOST_REGEX=
+HAVE_BOOST_REGEX=no
 BOOST_REGEX_LIBS=
 
 if test "${ac_cv_header_boost_regex_h+set}" = set; then
@@ -19095,7 +19095,7 @@
 echo "${ECHO_T}$ac_cv_lib_boost_regex_regexecA" >&6
 if test $ac_cv_lib_boost_regex_regexecA = yes; then
 
-    HAVE_BOOST_REGEX=1
+    HAVE_BOOST_REGEX=yes
     BOOST_REGEX_LIBS=-lboost_regex
 
 fi

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-03-27 16:54:54 UTC (rev 154)
+++ trunk/configure.in	2004-03-27 17:00:14 UTC (rev 155)
@@ -22,12 +22,12 @@
 PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${VERSION}"
 AC_SUBST(PROTHON_DEFAULT_MODDIR)
 
-HAVE_BOOST_REGEX=
+HAVE_BOOST_REGEX=no
 BOOST_REGEX_LIBS=
 
 AC_CHECK_HEADER(boost/regex.h,
   [AC_CHECK_LIB(boost_regex, regexecA, [
-    HAVE_BOOST_REGEX=1
+    HAVE_BOOST_REGEX=yes
     BOOST_REGEX_LIBS=-lboost_regex
   ])])
 

Modified: trunk/modules/Makefile.in
===================================================================
--- trunk/modules/Makefile.in	2004-03-27 16:54:54 UTC (rev 154)
+++ trunk/modules/Makefile.in	2004-03-27 17:00:14 UTC (rev 155)
@@ -7,8 +7,14 @@
 
 include $(top_builddir)/Rules.mk
 
-MODULES = Dict File Float List String Tuple Re
+MODULES = Dict File Float List String Tuple
 
+HAVE_BOOST_REGEX = @HAVE_BOOST_REGEX@
+
+ifeq ($(HAVE_BOOST_REGEX),yes)
+MODULES += Re
+endif
+
 all clean:
 	@for subdir in $(MODULES); do   \
 		$(MAKE) -C $$subdir $@; \

Modified: trunk/modules/Re/Makefile.in
===================================================================
--- trunk/modules/Re/Makefile.in	2004-03-27 16:54:54 UTC (rev 154)
+++ trunk/modules/Re/Makefile.in	2004-03-27 17:00:14 UTC (rev 155)
@@ -7,16 +7,11 @@
 
 include $(top_builddir)/Rules.mk
 
-HAVE_BOOST_REGEX = @HAVE_BOOST_REGEX@
 BOOST_REGEX_LIBS = @BOOST_REGEX_LIBS@
 
 MODULE_NAME=Re
 
-ifneq ($(HAVE_BOOST_REGEX),)
 TARGET = $(MODULE_NAME).la
-else
-TARGET = 
-endif
 
 OBJS = $(MODULE_NAME).lo