Changeset e40a0d in git

Timestamp:

Sep 26, 2011, 3:17:37 PM (12 years ago)

Author:

Volker Braun <vbraun.name@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4eb485635d45ce52dc829f85b42fe078e603df55

Parents:

dfc60c82a16c9b03ecb8def0e0bff88d77446b9e

git-author:

Volker Braun <vbraun.name@gmail.com>2011-09-26 15:17:37+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:33+01:00

Message:

Only compile readcf.yy / readcf.cc if configured --without-Singular

This fixes compile issue in Fedora 15.

Location:

factory

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• readcf.yy (modified) (2 diffs)

factory/Makefile.am

@@ -91 +91 @@
                 parseutil.cc \
                 ftmpl_inst.cc \
-                factory.h factoryconf.h cplusplus.h \
-                readcf.yy
+                factory.h factoryconf.h cplusplus.h
+
+if WITHOUT_SINGULAR
+    SOURCES +=  readcf.yy
+endif
 
 

factory/configure.ac

@@ -41 +41 @@
   ,
   [with_Singular=yes])
-
-
-# font-lock-trick: '
+AM_CONDITIONAL([WITHOUT_SINGULAR], [test x$with_Singular != xyes])
+
 
 AC_ARG_WITH(

factory/readcf.yy

@@ -6 +6 @@
 #include "config.h"
 #include "factoryconf.h"
-
-#if (!defined(NOSTREAMIO)) && (!defined(SINGULAR))
-
 
 #if defined(WINNT) && ! defined(__GNUC__)
@@ -218 +215 @@
 }
 
-
-#endif 
-/* #ifndef SINGULAR && ifndef NOSTREAMIO */