[Saga-devel] saga SVN commit 3340: /trunk/saga/impl/packages/sd/

[paul.livesey at stfc.ac.uk]

User: svn_plivesey
Date: 2009/01/21 04:54 AM

Modified:
 /trunk/saga/impl/packages/sd/
  saga.package.sd.i.mk.in, saga.package.sd.mk.in

Log:
 Removed the Antlr checks.

File Changes:

Directory: /trunk/saga/impl/packages/sd/
========================================

File [modified]: saga.package.sd.i.mk.in
Delta lines: +1 -7
===================================================================
--- trunk/saga/impl/packages/sd/saga.package.sd.i.mk.in	2009-01-20 14:11:48 UTC (rev 3339)
+++ trunk/saga/impl/packages/sd/saga.package.sd.i.mk.in	2009-01-21 10:54:06 UTC (rev 3340)
@@ -1,13 +1,7 @@
 
 SAGA_HAVE_PACKAGE_SD = @SAGA_HAVE_PACKAGE_SD@
-SAGA_HAVE_ANTLR      = @HAVE_ANTLR@
 
-TMP_SAGA_HAVE_ANTLR  = $(SAGA_HAVE_ANTLR)
-ifeq "$(SAGA_HAVE_ANTLR)" "internal"
-  TMP_SAGA_HAVE_ANTLR=yes
-endif
-
-ifeq "$(TMP_SAGA_HAVE_ANTLR)-$(SAGA_HAVE_PACKAGE_SD)" "yes-yes"
+ifeq "$(SAGA_HAVE_PACKAGE_SD)" "yes"
   SAGA_LDFLAGS  += -L/@SAGA_ROOT@/saga/impl/packages/sd
   SAGA_LDFLAGS  += -lsaga_package_sd
 endif

File [modified]: saga.package.sd.mk.in
Delta lines: +1 -7
===================================================================
--- trunk/saga/impl/packages/sd/saga.package.sd.mk.in	2009-01-20 14:11:48 UTC (rev 3339)
+++ trunk/saga/impl/packages/sd/saga.package.sd.mk.in	2009-01-21 10:54:06 UTC (rev 3340)
@@ -1,13 +1,7 @@
 
 SAGA_HAVE_PACKAGE_SD = @SAGA_HAVE_PACKAGE_SD@
-SAGA_HAVE_ANTLR      = @HAVE_ANTLR@
 
-TMP_SAGA_HAVE_ANTLR  = $(SAGA_HAVE_ANTLR)
-ifeq "$(SAGA_HAVE_ANTLR)" "internal"
-  TMP_SAGA_HAVE_ANTLR=yes
-endif
-
-ifeq "$(TMP_SAGA_HAVE_ANTLR)-$(SAGA_HAVE_PACKAGE_SD)" "yes-yes"
+ifeq "$(SAGA_HAVE_PACKAGE_SD)" "yes"
  SAGA_LDFLAGS  += -lsaga_package_sd
 endif