[Gtk2hs-commit] gtk2hs ChangeLog,1.546,1.547 configure.ac,1.48,1.49

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27307

Modified Files:
	ChangeLog configure.ac 
Log Message:
Make sure we only fail due to problems with the version of happy if we would
actually use happy during the build (ie not in a normal distribution tarball).


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- configure.ac	7 Jun 2005 12:37:51 -0000	1.48
+++ configure.ac	7 Jun 2005 15:23:22 -0000	1.49
@@ -569,19 +569,22 @@
 if test "$BUILT_IN_C2HS" = yes; then
   AC_PATH_PROG(HAPPY,happy, no)
   if test "$HAPPY" = no; then
-    dnl We only need to complain if we would actually have to invoke happy
-    dnl which would not be the case for a normal distribution tarball in which
-    dnl the parser .hs file exists and is newer then the parser .y file	    
-    CParser=${srcdir}/tools/c2hs/c/CParser2
-    if test ! -f ${CParser}.hs -o ${CParser}.hs -ot ${CParser}.y; then
-      AC_MSG_ERROR([Could not find happy which is needed to build c2hs.])
-    fi
+    HAPPY_ERROR="Could not find happy which is needed to build c2hs."
   else
     AC_MSG_CHECKING([version of happy])
     HAPPY_VERSION=`$HAPPY --version | $SED "s/[[^0-9.]*\([0-9.]*\) .*]/\1/"`;
     AC_MSG_RESULT([$HAPPY_VERSION])
     GTKHS_PROG_CHECK_VERSION($HAPPY_VERSION, -lt, 1.15.0, [
-  AC_MSG_ERROR([A newer version of happy is required.])])
+      HAPPY_ERROR="Version 1.15 or later of happy is required."])
+  fi
+  if test -n "$HAPPY_ERROR"; then
+    dnl We only need to complain if we would actually have to invoke happy
+    dnl which would not be the case for a normal distribution tarball in which
+    dnl the parser .hs file exists and is newer then the parser .y file
+    CParser=${srcdir}/tools/c2hs/c/CParser2
+    if test ! -f ${CParser}.hs -o ${CParser}.hs -ot ${CParser}.y; then
+      AC_MSG_ERROR([$HAPPY_ERROR])
+    fi
   fi
 fi
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -d -r1.546 -r1.547
--- ChangeLog	7 Jun 2005 12:37:51 -0000	1.546
+++ ChangeLog	7 Jun 2005 15:23:22 -0000	1.547
@@ -11,6 +11,10 @@
 	LDFLAGS are not used as the FILTER_(C|LD)FLAGS as implicitly happened
 	before and which caused build problems on OpenBSD.
 
+	* configure.ac: make sure we only fail due to problems with the
+	version of happy if we would actually use happy during the build (ie
+	not in a normal distribution tarball).
+
 2005-06-7 Axel Simon <A....@ke...>
 
 	* configure.ac: Fail if happy version is less than 1.15.