[Saga-devel] saga SVN commit 3336: /trunk/
amerzky at cct.lsu.edu
amerzky at cct.lsu.edu
Tue Jan 20 07:18:07 CST 2009
User: amerzky
Date: 2009/01/20 07:18 AM
Removed:
/trunk/config/
saga.config.antlr.c.mk.in, saga_antlr.m4
/trunk/external/antlr/
Modified:
/trunk/
configure, configure.in
/trunk/adaptors/aws/aws_job/
aws_job_service.cpp
/trunk/config/
saga.config.c.mk.in, saga_base.m4
/trunk/examples/misc/
aws.cpp, ssh_file.cpp
/trunk/saga/saga/
url.cpp
Log:
remove antlr configure and external
A
File Changes:
Directory: /trunk/adaptors/aws/aws_job/
=======================================
File [modified]: aws_job_service.cpp
Delta lines: +1 -3
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.cpp 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/adaptors/aws/aws_job/aws_job_service.cpp 2009-01-20 13:17:31 UTC (rev 3336)
@@ -177,9 +177,7 @@
proc.add_args ("-o", "StrictHostKeyChecking=no");
proc.add_args ("-i", ini_["ec2_proxy"]);
proc.add_arg ("root@" + vm_ip_);
- // proc.add_arg ("/bin/true");
- proc.add_arg ("/usr/bin/touch");
- proc.add_arg ("/tmp/ssh_was_here");
+ proc.add_arg ("/bin/true");
(void) proc.run_sync ();
Directory: /trunk/config/
=========================
File [removed]: saga.config.antlr.c.mk.in
Delta lines: +0 -28
===================================================================
--- trunk/config/saga.config.antlr.c.mk.in 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/config/saga.config.antlr.c.mk.in 2009-01-20 13:17:31 UTC (rev 3336)
@@ -1,28 +0,0 @@
-# Copyright (c) 2005-2007 Andre Merzky (andre at merzky.net)
-#
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-ifndef SAGA_MK_INC_CONF_ANTLR
- SAGA_MK_INC_CONF_ANTLR = yes
-
-
-###########################################################
-#
-# ANTLR
-#
-# use antlr from external/antlr
-SAGA_HAVE_INTERNAL_ANTLR = yes
-SAGA_ANTLR_INC_FLAGS = -I$(SAGA_ROOT)/external/antlr
-SAGA_ANTLR_LDFLAGS = -L$(SAGA_ROOT)/external/antlr/src -lantlr
-
-# only use it though when we are within the SAGA source tree...
-ifdef SAGA_ROOT
- SAGA_LDFLAGS_EXT += $(SAGA_ANTLR_LDFLAGS)
- SAGA_CPPINCS += $(SAGA_ANTLR_INC_FLAGS)
-endif
-#
-###########################################################
-
-endif # guard
-
File [modified]: saga.config.c.mk.in
Delta lines: +1 -5
===================================================================
--- trunk/config/saga.config.c.mk.in 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/config/saga.config.c.mk.in 2009-01-20 13:17:31 UTC (rev 3336)
@@ -53,14 +53,12 @@
TEST = @SAGA_TEST@
TRUE = @SAGA_TRUE@
UNIQ = @SAGA_UNIQ@
-ANTLR = @SAGA_ANTLR@
MKDIR = @SAGA_MKDIR@ -p
TOUCH = @SAGA_TOUCH@
FALSE = @SAGA_FALSE@
XARGS = @SAGA_XARGS@
DOXYGEN = @SAGA_DOXYGEN@
DEVNULL = @SAGA_DEVNULL@
-ANTLRCFG = @SAGA_ANTLRCFG@
MAKE += --no-print-directory
#
@@ -200,15 +198,13 @@
###########################################################
#
-# well, we always need boost, and antlr
+# well, we always need boost
#
ifeq "$(filter clean distclean confclean,$(MAKECMDGOALS))" ""
ifdef SAGA_ROOT
include $(SAGA_ROOT)/make/saga.config.boost.c.mk
- include $(SAGA_ROOT)/make/saga.config.antlr.c.mk
else
include $(SAGA_LOCATION)/share/saga/make/saga.config.boost.c.mk
- include $(SAGA_LOCATION)/share/saga/make/saga.config.antlr.c.mk
endif
endif
#
File [removed]: saga_antlr.m4
Delta lines: +0 -42
===================================================================
--- trunk/config/saga_antlr.m4 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/config/saga_antlr.m4 2009-01-20 13:17:31 UTC (rev 3336)
@@ -1,42 +0,0 @@
-
-AC_DEFUN([AX_SAGA_CHECK_ANTLR],
-[
- AC_PATH_PROG(SAGA_ANTLR, antlr)
- AC_PATH_PROG(SAGA_ANTLRCFG, antlr-config)
- AC_MSG_CHECKING(for antlr devel)
- HAVE_ANTLR=no
-
- if ! test "x$SAGA_ANTLR" = "x"; then
- if ! test "x$SAGA_ANTLRCFG" = "x"; then
-
- ANTLR_PREFIX=`$SAGA_ANTLRCFG --prefix`
-
- if test -f $ANTLR_PREFIX/include/antlr/config.hpp; then
- ANTLR_LOCATION=`$SAGA_ANTLRCFG --prefix`
- ANTLR_CCFLAGS=`$SAGA_ANTLRCFG --cflags`
- ANTLR_CXXFLAGS=`$SAGA_ANTLRCFG --cxxflags`
- ANTLR_LDFLAGS=`$SAGA_ANTLRCFG --libs`
- ANTLR_S_LIBS=`$SAGA_ANTLRCFG --libs`
- # antlr uses static libs
-
- HAVE_ANTLR=yes
- fi
- fi
- fi
-
- if test "$HAVE_ANTLR" = "no"; then
- SAGA_HAVE_INTERNAL_ANTLR=yes
- HAVE_ANTLR=internal
- fi
-
- AC_MSG_RESULT([$HAVE_ANTLR])
-
- AC_SUBST(HAVE_ANTLR)
- AC_SUBST(SAGA_HAVE_INTERNAL_ANTLR)
- AC_SUBST(ANTLR_LOCATION)
- AC_SUBST(ANTLR_CCFLAGS)
- AC_SUBST(ANTLR_CXXFLAGS)
- AC_SUBST(ANTLR_LDFLAGS)
- AC_SUBST(ANTLR_S_LIBS)
-])
-
File [modified]: saga_base.m4
Delta lines: +0 -1
===================================================================
--- trunk/config/saga_base.m4 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/config/saga_base.m4 2009-01-20 13:17:31 UTC (rev 3336)
@@ -1,6 +1,5 @@
m4_include([config/saga_boost.m4])
-m4_include([config/saga_antlr.m4])
m4_include([config/saga_ldl.m4])
AC_DEFUN([AX_SAGA_CHECK_BASE],
Directory: /trunk/examples/misc/
================================
File [modified]: aws.cpp
Delta lines: +3 -3
===================================================================
--- trunk/examples/misc/aws.cpp 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/examples/misc/aws.cpp 2009-01-20 13:17:31 UTC (rev 3336)
@@ -94,12 +94,12 @@
// "https://vm02.cct.lsu.edu:8443/"
// create a new instance on ec2, and run a test job
- test_cloud (jd, "ec2");
+ // test_cloud (jd, "ec2");
// test_cloud (jd, "ec2", "i-d642c7bf");
// same for eucalyptus
- // test_cloud (jd, "eucalyptus");
- // test_cloud (jd, "eucalyptus", "i-417E085F");
+ test_cloud (jd, "eucalyptus");
+ // test_cloud (jd, "eucalyptus", "i-4C1308D3");
// same for nimbus
// test_cloud (jd, "nimbus");
File [modified]: ssh_file.cpp
Delta lines: +1 -1
===================================================================
--- trunk/examples/misc/ssh_file.cpp 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/examples/misc/ssh_file.cpp 2009-01-20 13:17:31 UTC (rev 3336)
@@ -11,7 +11,7 @@
c.set_defaults ();
s.add_context (c);
- saga::filesystem::directory d1 (s, "ssh://qb.loni.org/home/merzky/");
+ saga::filesystem::directory d1 (s, "ssh://amerzky@is.cct.lsu.edu/home/merzky/");
std::cout << "d1: " << d1.get_url () << "\n";
Directory: /trunk/saga/saga/
============================
File [modified]: url.cpp
Delta lines: +1 -1
===================================================================
--- trunk/saga/saga/url.cpp 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/saga/saga/url.cpp 2009-01-20 13:17:31 UTC (rev 3336)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Hartmut Kaiser
+/i Copyright (c) 2005-2009 Hartmut Kaiser
//
// Use, modification and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
Directory: /trunk/
==================
File [modified]: configure
Delta lines: +17 -164
===================================================================
--- trunk/configure 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/configure 2009-01-20 13:17:31 UTC (rev 3336)
@@ -725,15 +725,6 @@
BOOST_LDFLAGS
BOOST_LIBS
BOOST_S_LIBS
-SAGA_ANTLR
-SAGA_ANTLRCFG
-HAVE_ANTLR
-SAGA_HAVE_INTERNAL_ANTLR
-ANTLR_LOCATION
-ANTLR_CCFLAGS
-ANTLR_CXXFLAGS
-ANTLR_LDFLAGS
-ANTLR_S_LIBS
SAGA_ROOT
SAGA_VERSION
SAGA_OSTYPE
@@ -9298,130 +9289,6 @@
echo "$as_me: error: Can't build SAGA without boost - abort" >&2;}
{ (exit 1); exit 1; }; }
fi
-
-
-
- # Extract the first word of "antlr", so it can be a program name with args.
-set dummy antlr; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SAGA_ANTLR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $SAGA_ANTLR in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SAGA_ANTLR="$SAGA_ANTLR" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SAGA_ANTLR="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-SAGA_ANTLR=$ac_cv_path_SAGA_ANTLR
-if test -n "$SAGA_ANTLR"; then
- { echo "$as_me:$LINENO: result: $SAGA_ANTLR" >&5
-echo "${ECHO_T}$SAGA_ANTLR" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- # Extract the first word of "antlr-config", so it can be a program name with args.
-set dummy antlr-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SAGA_ANTLRCFG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $SAGA_ANTLRCFG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SAGA_ANTLRCFG="$SAGA_ANTLRCFG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SAGA_ANTLRCFG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-SAGA_ANTLRCFG=$ac_cv_path_SAGA_ANTLRCFG
-if test -n "$SAGA_ANTLRCFG"; then
- { echo "$as_me:$LINENO: result: $SAGA_ANTLRCFG" >&5
-echo "${ECHO_T}$SAGA_ANTLRCFG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- { echo "$as_me:$LINENO: checking for antlr devel" >&5
-echo $ECHO_N "checking for antlr devel... $ECHO_C" >&6; }
- HAVE_ANTLR=no
-
- if ! test "x$SAGA_ANTLR" = "x"; then
- if ! test "x$SAGA_ANTLRCFG" = "x"; then
-
- ANTLR_PREFIX=`$SAGA_ANTLRCFG --prefix`
-
- if test -f $ANTLR_PREFIX/include/antlr/config.hpp; then
- ANTLR_LOCATION=`$SAGA_ANTLRCFG --prefix`
- ANTLR_CCFLAGS=`$SAGA_ANTLRCFG --cflags`
- ANTLR_CXXFLAGS=`$SAGA_ANTLRCFG --cxxflags`
- ANTLR_LDFLAGS=`$SAGA_ANTLRCFG --libs`
- ANTLR_S_LIBS=`$SAGA_ANTLRCFG --libs`
- # antlr uses static libs
-
- HAVE_ANTLR=yes
- fi
- fi
- fi
-
- if test "$HAVE_ANTLR" = "no"; then
- SAGA_HAVE_INTERNAL_ANTLR=yes
- HAVE_ANTLR=internal
- fi
-
- { echo "$as_me:$LINENO: result: $HAVE_ANTLR" >&5
-echo "${ECHO_T}$HAVE_ANTLR" >&6; }
-
-
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files config/saga.config.antlr.c.mk"
-
#
###########################################################
@@ -13919,7 +13786,7 @@
echo " " | $TEE $OUT
echo " ======================================================== " | $TEE $OUT
echo " SAGA CORE - Configuration Summary " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA Source : $SAGA_ROOT " | $TEE $OUT
echo " Install Location : $SAGA_LOCATION " | $TEE $OUT
@@ -13927,20 +13794,17 @@
echo " SAGA DEBUG : $SAGA_HAVE_DEBUG $SAGA_CXXFLAGS_DEBUG " | $TEE $OUT
echo " SAGA LITE : $SAGA_HAVE_LITE " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - External Libraries " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " Boost Found : $HAVE_BOOST " | $TEE $OUT
echo " Boost Version : $BOOST_VERSION " | $TEE $OUT
echo " Boost Location : $BOOST_LOCATION " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ANTLR Found : $HAVE_ANTLR " | $TEE $OUT
-echo " ANTLR Location : $ANTLR_LOCATION " | $TEE $OUT
-echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - API Packages " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA PACKAGE JOB : $SAGA_HAVE_PACKAGE_JOB " | $TEE $OUT
echo " SAGA PACKAGE NAMESPACE : $SAGA_HAVE_PACKAGE_NAMESPACE " | $TEE $OUT
@@ -13952,9 +13816,9 @@
echo " SAGA PACKAGE SD : $SAGA_HAVE_PACKAGE_SD " | $TEE $OUT
echo " SAGA PACKAGE CPR : $SAGA_HAVE_PACKAGE_CPR " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - CPI Packages (Adaptors) " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA ADAPTOR CONTEXT : $SAGA_HAVE_ADAPTOR_CONTEXT " | $TEE $OUT
echo " SAGA ADAPTOR JOB : $SAGA_HAVE_ADAPTOR_JOB " | $TEE $OUT
@@ -14629,7 +14493,6 @@
do
case $ac_config_target in
"config/saga.config.boost.c.mk") CONFIG_FILES="$CONFIG_FILES config/saga.config.boost.c.mk" ;;
- "config/saga.config.antlr.c.mk") CONFIG_FILES="$CONFIG_FILES config/saga.config.antlr.c.mk" ;;
"config/saga.config.c.mk") CONFIG_FILES="$CONFIG_FILES config/saga.config.c.mk" ;;
"config/saga.config.check.c.mk") CONFIG_FILES="$CONFIG_FILES config/saga.config.check.c.mk" ;;
"config/saga-config") CONFIG_FILES="$CONFIG_FILES config/saga-config" ;;
@@ -14873,15 +14736,6 @@
BOOST_LDFLAGS!$BOOST_LDFLAGS$ac_delim
BOOST_LIBS!$BOOST_LIBS$ac_delim
BOOST_S_LIBS!$BOOST_S_LIBS$ac_delim
-SAGA_ANTLR!$SAGA_ANTLR$ac_delim
-SAGA_ANTLRCFG!$SAGA_ANTLRCFG$ac_delim
-HAVE_ANTLR!$HAVE_ANTLR$ac_delim
-SAGA_HAVE_INTERNAL_ANTLR!$SAGA_HAVE_INTERNAL_ANTLR$ac_delim
-ANTLR_LOCATION!$ANTLR_LOCATION$ac_delim
-ANTLR_CCFLAGS!$ANTLR_CCFLAGS$ac_delim
-ANTLR_CXXFLAGS!$ANTLR_CXXFLAGS$ac_delim
-ANTLR_LDFLAGS!$ANTLR_LDFLAGS$ac_delim
-ANTLR_S_LIBS!$ANTLR_S_LIBS$ac_delim
SAGA_ROOT!$SAGA_ROOT$ac_delim
SAGA_VERSION!$SAGA_VERSION$ac_delim
SAGA_OSTYPE!$SAGA_OSTYPE$ac_delim
@@ -14955,6 +14809,15 @@
SAGA_HAVE_ADAPTOR_REPLICA!$SAGA_HAVE_ADAPTOR_REPLICA$ac_delim
SAGA_HAVE_ADAPTOR_NAMESPACE!$SAGA_HAVE_ADAPTOR_NAMESPACE$ac_delim
SAGA_HAVE_ADAPTOR_STREAM!$SAGA_HAVE_ADAPTOR_STREAM$ac_delim
+SAGA_HAVE_ADAPTOR_RPC!$SAGA_HAVE_ADAPTOR_RPC$ac_delim
+SAGA_HAVE_ADAPTOR_ADVERT!$SAGA_HAVE_ADAPTOR_ADVERT$ac_delim
+SAGA_HAVE_ADAPTOR_SD!$SAGA_HAVE_ADAPTOR_SD$ac_delim
+SAGA_HAVE_ADAPTOR_CPR!$SAGA_HAVE_ADAPTOR_CPR$ac_delim
+SAGA_BUILD_ADAPTORS!$SAGA_BUILD_ADAPTORS$ac_delim
+SAGA_HAVE_ADAPTOR_SUITE_DEFAULT!$SAGA_HAVE_ADAPTOR_SUITE_DEFAULT$ac_delim
+SAGA_HAVE_ADAPTOR_SUITE_GLOBUS!$SAGA_HAVE_ADAPTOR_SUITE_GLOBUS$ac_delim
+SAGA_HAVE_ADAPTOR_SUITE_OMII!$SAGA_HAVE_ADAPTOR_SUITE_OMII$ac_delim
+SAGA_HAVE_ADAPTOR_SUITE_CONDOR!$SAGA_HAVE_ADAPTOR_SUITE_CONDOR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -14996,15 +14859,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SAGA_HAVE_ADAPTOR_RPC!$SAGA_HAVE_ADAPTOR_RPC$ac_delim
-SAGA_HAVE_ADAPTOR_ADVERT!$SAGA_HAVE_ADAPTOR_ADVERT$ac_delim
-SAGA_HAVE_ADAPTOR_SD!$SAGA_HAVE_ADAPTOR_SD$ac_delim
-SAGA_HAVE_ADAPTOR_CPR!$SAGA_HAVE_ADAPTOR_CPR$ac_delim
-SAGA_BUILD_ADAPTORS!$SAGA_BUILD_ADAPTORS$ac_delim
-SAGA_HAVE_ADAPTOR_SUITE_DEFAULT!$SAGA_HAVE_ADAPTOR_SUITE_DEFAULT$ac_delim
-SAGA_HAVE_ADAPTOR_SUITE_GLOBUS!$SAGA_HAVE_ADAPTOR_SUITE_GLOBUS$ac_delim
-SAGA_HAVE_ADAPTOR_SUITE_OMII!$SAGA_HAVE_ADAPTOR_SUITE_OMII$ac_delim
-SAGA_HAVE_ADAPTOR_SUITE_CONDOR!$SAGA_HAVE_ADAPTOR_SUITE_CONDOR$ac_delim
SAGA_HAVE_ADAPTOR_SUITE_LSF!$SAGA_HAVE_ADAPTOR_SUITE_LSF$ac_delim
SAGA_HAVE_ADAPTOR_SUITE_AWS!$SAGA_HAVE_ADAPTOR_SUITE_AWS$ac_delim
SAGA_HAVE_ADAPTOR_SUITE_SSH!$SAGA_HAVE_ADAPTOR_SUITE_SSH$ac_delim
@@ -15015,7 +14869,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -15412,7 +15266,6 @@
case $ac_file$ac_mode in
"config/saga.config.boost.c.mk":F) cp config/saga.config.boost.c.mk ./make/ ;;
- "config/saga.config.antlr.c.mk":F) cp config/saga.config.antlr.c.mk ./make/ ;;
"config/saga.config.c.mk":F) cp config/saga.config.c.mk ./make/ ;;
"config/saga.config.check.c.mk":F) cp config/saga.config.check.c.mk ./make/ ;;
"config/saga-config":F) chmod 0755 config/saga-config ;;
File [modified]: configure.in
Delta lines: +7 -16
===================================================================
--- trunk/configure.in 2009-01-20 09:39:56 UTC (rev 3335)
+++ trunk/configure.in 2009-01-20 13:17:31 UTC (rev 3336)
@@ -31,12 +31,6 @@
if test "x$HAVE_BOOST" != "xyes"; then
AC_MSG_ERROR(Can't build SAGA without boost - abort)
fi
-
-
-AX_SAGA_CHECK_ANTLR()
-
-AC_CONFIG_FILES([config/saga.config.antlr.c.mk],
- [cp config/saga.config.antlr.c.mk ./make/])
#
###########################################################
@@ -153,7 +147,7 @@
echo " " | $TEE $OUT
echo " ======================================================== " | $TEE $OUT
echo " SAGA CORE - Configuration Summary " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA Source : $SAGA_ROOT " | $TEE $OUT
echo " Install Location : $SAGA_LOCATION " | $TEE $OUT
@@ -161,20 +155,17 @@
echo " SAGA DEBUG : $SAGA_HAVE_DEBUG $SAGA_CXXFLAGS_DEBUG " | $TEE $OUT
echo " SAGA LITE : $SAGA_HAVE_LITE " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - External Libraries " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " Boost Found : $HAVE_BOOST " | $TEE $OUT
echo " Boost Version : $BOOST_VERSION " | $TEE $OUT
echo " Boost Location : $BOOST_LOCATION " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ANTLR Found : $HAVE_ANTLR " | $TEE $OUT
-echo " ANTLR Location : $ANTLR_LOCATION " | $TEE $OUT
-echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - API Packages " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA PACKAGE JOB : $SAGA_HAVE_PACKAGE_JOB " | $TEE $OUT
echo " SAGA PACKAGE NAMESPACE : $SAGA_HAVE_PACKAGE_NAMESPACE " | $TEE $OUT
@@ -186,9 +177,9 @@
echo " SAGA PACKAGE SD : $SAGA_HAVE_PACKAGE_SD " | $TEE $OUT
echo " SAGA PACKAGE CPR : $SAGA_HAVE_PACKAGE_CPR " | $TEE $OUT
echo " " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " SAGA CORE - CPI Packages (Adaptors) " | $TEE $OUT
-echo " ======================================================== " | $TEE $OUT
+echo " -------------------------------------------------------- " | $TEE $OUT
echo " " | $TEE $OUT
echo " SAGA ADAPTOR CONTEXT : $SAGA_HAVE_ADAPTOR_CONTEXT " | $TEE $OUT
echo " SAGA ADAPTOR JOB : $SAGA_HAVE_ADAPTOR_JOB " | $TEE $OUT
More information about the saga-devel
mailing list