[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/frontman
From:       David Faure <faure () kde ! org>
Date:       2004-02-10 10:57:38
Message-ID: 20040210105738.1A9C29953 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Use automake conditionals to define conditional subdirs.


  M +4 -1      configure.in.in   1.9
  M +14 -3     src/langs/Makefile.am   1.4


--- kdenonbeta/frontman/configure.in.in  #1.8:1.9
@@ -59,3 +59,6 @@
   ])
 
-AC_SUBST([LANGS],["$frontman_octave $frontman_macaulay2 $frontman_singular $frontman_yacas"])
+AM_CONDITIONAL(include_frontman_octave, test -n "$frontman_octave")
+AM_CONDITIONAL(include_frontman_macaulay2, test -n "$frontman_macaulay2")
+AM_CONDITIONAL(include_frontman_singular, test -n "$frontman_singular")
+AM_CONDITIONAL(include_frontman_yacas, test -n "$frontman_yacas")

--- kdenonbeta/frontman/src/langs/Makefile.am  #1.3:1.4
@@ -1,6 +1,17 @@
 ### Makefile.am for frontman/src/langs
+if include_frontman_octave
+LANG_OCTAVE=octave
+endif
+if include_frontman_macaulay2
+LANG_MACAULAY2=macaulay2
+endif
+if include_frontman_singular
+LANG_SINGULAR=singular
+endif
+if include_frontman_yacas
+LANG_YACAS=yacas
+endif
 
-SUBDIRS = $(LANGS)
-
+SUBDIRS = $(LANG_OCTAVE) $(LANG_MACAULAY2) $(LANG_SINGULAR) $(LANG_YACAS)
 
 # $Id$


[prev in list] [next in list] [prev in thread] [next in thread]